aboutsummaryrefslogtreecommitdiffstats
path: root/policy/device_policy_impl.cc
diff options
context:
space:
mode:
Diffstat (limited to 'policy/device_policy_impl.cc')
-rw-r--r--policy/device_policy_impl.cc7
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;