diff options
| author | Qijiang Fan <fqj@google.com> | 2020-07-31 05:26:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-31 05:26:13 +0000 |
| commit | 34cc0826b29cf9c6ca1f957ea96f2e9d6c59dbfb (patch) | |
| tree | e4b17bc1760497f672b09416be3e1a34c08a7604 /policy/device_policy_impl.cc | |
| parent | 35d33c2abd0f6b51d7569afc119cb0a85c430dba (diff) | |
| parent | 830b8b038f60039b54eb661c52a22fe35460ff8c (diff) | |
| download | platform_external_libbrillo-34cc0826b29cf9c6ca1f957ea96f2e9d6c59dbfb.tar.gz platform_external_libbrillo-34cc0826b29cf9c6ca1f957ea96f2e9d6c59dbfb.tar.bz2 platform_external_libbrillo-34cc0826b29cf9c6ca1f957ea96f2e9d6c59dbfb.zip | |
Revert "libbrillo: rename base::JSONReader methods" am: 830b8b038f
Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1371780
Change-Id: I6a625a8d35f0522756099781eacc72e374ef57e8
Diffstat (limited to 'policy/device_policy_impl.cc')
| -rw-r--r-- | policy/device_policy_impl.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/policy/device_policy_impl.cc b/policy/device_policy_impl.cc index de082bf..54ea1f9 100644 --- a/policy/device_policy_impl.cc +++ b/policy/device_policy_impl.cc @@ -154,11 +154,10 @@ bool DecodeWeeklyTimeFromValue(const base::DictionaryValue& dict_value, std::unique_ptr<base::ListValue> DecodeListValueFromJSON( const std::string& json_string) { std::string error; - // TODO(crbug.com/1054279): use base::JSONReader::ReadAndReturnValueWithError - // after uprev to r680000. std::unique_ptr<base::Value> decoded_json = - base::JSONReader::ReadAndReturnErrorDeprecated( - json_string, base::JSON_ALLOW_TRAILING_COMMAS, nullptr, &error); + base::JSONReader::ReadAndReturnError(json_string, + base::JSON_ALLOW_TRAILING_COMMAS, + nullptr, &error); if (!decoded_json) { LOG(ERROR) << "Invalid JSON string: " << error; return nullptr; |