BASELINE: Update Chromium to 84.0.4147.141

Change-Id: Ib85eb4cfa1cbe2b2b81e5022c8cad5c493969535
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

2 files changed, 5 insertions, 10 deletions

diff --git a/chromium/services/data_decoder/image_decoder_impl.cc b/chromium/services/data_decoder/image_decoder_impl.cc
index e65dc0d2c97..9ba119aa9fe 100644
--- a/chromium/services/data_decoder/image_decoder_impl.cc
+++ b/chromium/services/data_decoder/image_decoder_impl.cc
@@ -8,7 +8,6 @@
 
 #include <utility>
 
-#include "base/logging.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/blink/public/platform/web_data.h"
diff --git a/chromium/services/data_decoder/json_parser_impl.cc b/chromium/services/data_decoder/json_parser_impl.cc
index 9de2c61b43a..e67cf4c9dcc 100644
--- a/chromium/services/data_decoder/json_parser_impl.cc
+++ b/chromium/services/data_decoder/json_parser_impl.cc
@@ -17,17 +17,13 @@ JsonParserImpl::JsonParserImpl() = default;
 JsonParserImpl::~JsonParserImpl() = default;
 
 void JsonParserImpl::Parse(const std::string& json, ParseCallback callback) {
-  int error_code;
-  std::string error;
-  std::unique_ptr<base::Value> value =
-      base::JSONReader::ReadAndReturnErrorDeprecated(json, base::JSON_PARSE_RFC,
-                                                     &error_code, &error);
-  if (value) {
-    std::move(callback).Run(base::make_optional(std::move(*value)),
-                            base::nullopt);
+  base::JSONReader::ValueWithError ret =
+      base::JSONReader::ReadAndReturnValueWithError(json);
+  if (ret.value) {
+    std::move(callback).Run(std::move(ret.value), base::nullopt);
   } else {
     std::move(callback).Run(base::nullopt,
-                            base::make_optional(std::move(error)));
+                            base::make_optional(std::move(ret.error_message)));
   }
 }