diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/fuchsia/base/config_reader.cc | |
parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
download | qtwebengine-chromium-85-based.tar.gz |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/fuchsia/base/config_reader.cc')
-rw-r--r-- | chromium/fuchsia/base/config_reader.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chromium/fuchsia/base/config_reader.cc b/chromium/fuchsia/base/config_reader.cc index 87eaab8e48c..0c73357e93a 100644 --- a/chromium/fuchsia/base/config_reader.cc +++ b/chromium/fuchsia/base/config_reader.cc @@ -29,14 +29,14 @@ base::Optional<base::Value> ReadPackageConfig() { return base::nullopt; } - base::JSONReader reader; - base::Optional<base::Value> parsed = reader.Read(file_content); - CHECK(parsed) << "Failed to parse " << path.value() << ": " - << reader.GetErrorMessage(); - CHECK(parsed->is_dict()) << "Config is not a JSON dictinary: " - << path.value(); - - return std::move(parsed.value()); + base::JSONReader::ValueWithError parsed = + base::JSONReader::ReadAndReturnValueWithError(file_content); + CHECK(parsed.value) << "Failed to parse " << path.value() << ": " + << parsed.error_message; + CHECK(parsed.value->is_dict()) + << "Config is not a JSON dictionary: " << path.value(); + + return std::move(parsed.value); } } // namespace |