From 830b8b038f60039b54eb661c52a22fe35460ff8c Mon Sep 17 00:00:00 2001 From: Qijiang Fan Date: Tue, 28 Jul 2020 16:25:57 +0900 Subject: Revert "libbrillo: rename base::JSONReader methods" This reverts commit 32948686256ac3df0e314b30749e32d94cff79a6. Reason for revert: JSONReaderDeprecated is not introduced in AOSP libchrome yet. Change-Id: I9c224dc8a3ce59c996e0da802723937d19c39118 --- policy/device_policy_impl.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'policy/device_policy_impl.cc') 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 DecodeListValueFromJSON( const std::string& json_string) { std::string error; - // TODO(crbug.com/1054279): use base::JSONReader::ReadAndReturnValueWithError - // after uprev to r680000. std::unique_ptr 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; -- cgit v1.2.3