Commit 9497da1f authored by Nigel Tao's avatar Nigel Tao Committed by Commit Bot

Upgrade ash/system/power from deprecated base::JSONReader API

Bug: 1070409
Change-Id: I2e275aeda6c16e3f9b02031be26fee5967e8f549
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2228273Reviewed-by: default avatarTetsui Ohkubo <tetsui@chromium.org>
Commit-Queue: Nigel Tao <nigeltao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#775054}
parent 7f37257a
...@@ -169,11 +169,12 @@ std::string GetExpectedAdvancedBatteryChargeModePolicyForPrefs( ...@@ -169,11 +169,12 @@ std::string GetExpectedAdvancedBatteryChargeModePolicyForPrefs(
void DecodeJsonStringAndNormalize(const std::string& json_string, void DecodeJsonStringAndNormalize(const std::string& json_string,
base::Value* value) { base::Value* value) {
base::JSONReader reader(base::JSON_ALLOW_TRAILING_COMMAS); base::JSONReader::ValueWithError parsed_json =
base::Optional<base::Value> read_value = reader.ReadToValue(json_string); base::JSONReader::ReadAndReturnValueWithError(
ASSERT_EQ(reader.GetErrorMessage(), ""); json_string, base::JSON_ALLOW_TRAILING_COMMAS);
ASSERT_TRUE(read_value.has_value()); ASSERT_EQ(parsed_json.error_message, "");
*value = std::move(read_value.value()); ASSERT_TRUE(parsed_json.value);
*value = std::move(*parsed_json.value);
} }
} // namespace } // namespace
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment