BASELINE: Update Chromium to 80.0.3987.136

Change-Id: I98e1649aafae85ba3a83e67af00bb27ef301db7b
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

9 files changed, 17 insertions, 116 deletions

diff --git a/chromium/components/ui_devtools/BUILD.gn b/chromium/components/ui_devtools/BUILD.gn
index cd2141fe0b2..6bb824dc840 100644
--- a/chromium/components/ui_devtools/BUILD.gn
+++ b/chromium/components/ui_devtools/BUILD.gn
@@ -107,12 +107,12 @@ component("ui_devtools") {
   }
 
   deps = [
-    ":devtools_protocol_encoding",
     ":protocol_generated_sources",
     "//base",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
     "//net",
+    "//third_party/inspector_protocol:crdtp",
     "//ui/gfx",
   ]
 
@@ -134,20 +134,9 @@ static_library("test_support") {
     "ui_devtools_unittest_utils.h",
   ]
   public_deps = [
-    ":devtools_protocol_encoding",
     ":ui_devtools",
     "//testing/gmock",
-  ]
-}
-
-static_library("devtools_protocol_encoding") {
-  sources = [
-    "devtools_protocol_encoding.cc",
-    "devtools_protocol_encoding.h",
-  ]
-  deps = [
-    "//base",
-    "//third_party/inspector_protocol:encoding",
+    "//third_party/inspector_protocol:crdtp",
   ]
 }
 
diff --git a/chromium/components/ui_devtools/devtools_client.cc b/chromium/components/ui_devtools/devtools_client.cc
index e84fdace0f8..b291394c562 100644
--- a/chromium/components/ui_devtools/devtools_client.cc
+++ b/chromium/components/ui_devtools/devtools_client.cc
@@ -4,8 +4,8 @@
 
 #include "components/ui_devtools/devtools_client.h"
 
-#include "components/ui_devtools/devtools_protocol_encoding.h"
 #include "components/ui_devtools/devtools_server.h"
+#include "third_party/inspector_protocol/crdtp/json.h"
 
 namespace ui_devtools {
 
@@ -59,10 +59,10 @@ void UiDevToolsClient::DisableAllAgents() {
 
 namespace {
 std::string SerializeToJSON(std::unique_ptr<protocol::Serializable> message) {
-  std::vector<uint8_t> cbor = message->serializeToBinary();
+  std::vector<uint8_t> cbor = std::move(*message).TakeSerialized();
   std::string json;
-  ::inspector_protocol_encoding::Status status =
-      ConvertCBORToJSON(::inspector_protocol_encoding::SpanFrom(cbor), &json);
+  crdtp::Status status =
+      crdtp::json::ConvertCBORToJSON(crdtp::SpanFrom(cbor), &json);
   LOG_IF(ERROR, !status.ok()) << status.ToASCIIString();
   return json;
 }
diff --git a/chromium/components/ui_devtools/devtools_protocol_encoding.cc b/chromium/components/ui_devtools/devtools_protocol_encoding.cc
deleted file mode 100644
index caa0cf2c652..00000000000
--- a/chromium/components/ui_devtools/devtools_protocol_encoding.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "components/ui_devtools/devtools_protocol_encoding.h"
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "base/strings/string_number_conversions.h"
-
-namespace ui_devtools {
-namespace {
-using ::inspector_protocol_encoding::span;
-using IPEStatus = ::inspector_protocol_encoding::Status;
-
-// Platform allows us to inject the string<->double conversion
-// routines from base:: into the inspector_protocol JSON parser / serializer.
-class Platform : public ::inspector_protocol_encoding::json::Platform {
- public:
-  bool StrToD(const char* str, double* result) const override {
-    return base::StringToDouble(str, result);
-  }
-
-  // Prints |value| in a format suitable for JSON.
-  std::unique_ptr<char[]> DToStr(double value) const override {
-    std::string str = base::NumberToString(value);
-    std::unique_ptr<char[]> result(new char[str.size() + 1]);
-    memcpy(result.get(), str.c_str(), str.size() + 1);
-    return result;
-  }
-};
-}  // namespace
-
-IPEStatus ConvertCBORToJSON(span<uint8_t> cbor, std::string* json) {
-  Platform platform;
-  return ::inspector_protocol_encoding::json::ConvertCBORToJSON(platform, cbor,
-                                                                json);
-}
-
-IPEStatus ConvertJSONToCBOR(span<uint8_t> json, std::string* cbor) {
-  Platform platform;
-  return ConvertJSONToCBOR(platform, json, cbor);
-}
-
-IPEStatus ConvertJSONToCBOR(span<uint8_t> json, std::vector<uint8_t>* cbor) {
-  Platform platform;
-  return ConvertJSONToCBOR(platform, json, cbor);
-}
-
-}  // namespace ui_devtools
diff --git a/chromium/components/ui_devtools/devtools_protocol_encoding.h b/chromium/components/ui_devtools/devtools_protocol_encoding.h
deleted file mode 100644
index 2ef44910589..00000000000
--- a/chromium/components/ui_devtools/devtools_protocol_encoding.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef COMPONENTS_UI_DEVTOOLS_DEVTOOLS_PROTOCOL_ENCODING_H_
-#define COMPONENTS_UI_DEVTOOLS_DEVTOOLS_PROTOCOL_ENCODING_H_
-
-#include <string>
-#include <vector>
-
-#include "third_party/inspector_protocol/encoding/encoding.h"
-
-// Convenience adaptation of the conversion function
-// ::inspector_protocol_encoding::json::ConvertCBORToJSON,
-// ::inspector_protocol_encoding::json::ConvertJSONToCBOR.
-// using an implementation of
-// ::inspector_protocol_encoding::json::Platform that
-// delegates to base/strings/string_number_conversions.h.
-namespace ui_devtools {
-::inspector_protocol_encoding::Status ConvertCBORToJSON(
-    ::inspector_protocol_encoding::span<uint8_t> cbor,
-    std::string* json);
-
-::inspector_protocol_encoding::Status ConvertJSONToCBOR(
-    ::inspector_protocol_encoding::span<uint8_t> json,
-    std::string* cbor);
-
-::inspector_protocol_encoding::Status ConvertJSONToCBOR(
-    ::inspector_protocol_encoding::span<uint8_t> json,
-    std::vector<uint8_t>* cbor);
-}  // namespace ui_devtools
-
-#endif  // COMPONENTS_UI_DEVTOOLS_DEVTOOLS_PROTOCOL_ENCODING_H_
diff --git a/chromium/components/ui_devtools/devtools_server.cc b/chromium/components/ui_devtools/devtools_server.cc
index b8007bec39a..2ded5e4f165 100644
--- a/chromium/components/ui_devtools/devtools_server.cc
+++ b/chromium/components/ui_devtools/devtools_server.cc
@@ -10,7 +10,6 @@
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/format_macros.h"
-#include "base/message_loop/message_loop.h"
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/strings/string_number_conversions.h"
diff --git a/chromium/components/ui_devtools/inspector_protocol_config.json b/chromium/components/ui_devtools/inspector_protocol_config.json
index cf40a8c3891..c8a2217b324 100644
--- a/chromium/components/ui_devtools/inspector_protocol_config.json
+++ b/chromium/components/ui_devtools/inspector_protocol_config.json
@@ -32,10 +32,8 @@
         "export_macro": "UI_DEVTOOLS_EXPORT",
         "export_header": "components/ui_devtools/devtools_export.h"
     },
-    "encoding_lib": {
-        "namespace": "inspector_protocol_encoding"
-    },
-    "bindings_lib": {
-        "namespace": "inspector_protocol_bindings"
+
+    "crdtp": {
+        "namespace": "crdtp"
     }
 }
diff --git a/chromium/components/ui_devtools/tracing_agent.cc b/chromium/components/ui_devtools/tracing_agent.cc
index 747b1e6f9ff..25beb16168f 100644
--- a/chromium/components/ui_devtools/tracing_agent.cc
+++ b/chromium/components/ui_devtools/tracing_agent.cc
@@ -16,7 +16,6 @@
 #include "base/trace_event/traced_value.h"
 #include "components/ui_devtools/connector_delegate.h"
 #include "components/ui_devtools/devtools_base_agent.h"
-#include "components/ui_devtools/devtools_protocol_encoding.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "mojo/public/cpp/system/data_pipe_drainer.h"
@@ -24,6 +23,7 @@
 #include "services/tracing/public/cpp/tracing_features.h"
 #include "services/tracing/public/mojom/constants.mojom.h"
 #include "services/tracing/public/mojom/perfetto_service.mojom.h"
+#include "third_party/inspector_protocol/crdtp/json.h"
 
 namespace ui_devtools {
 
@@ -311,8 +311,8 @@ void TracingAgent::OnTraceDataCollected(
                  trace_data_buffer_state_.offset);
   message += "] } }";
   std::vector<uint8_t> cbor;
-  ::inspector_protocol_encoding::Status status = ConvertJSONToCBOR(
-      ::inspector_protocol_encoding::SpanFrom(message), &cbor);
+  crdtp::Status status =
+      crdtp::json::ConvertJSONToCBOR(crdtp::SpanFrom(message), &cbor);
   LOG_IF(ERROR, !status.ok()) << status.ToASCIIString();
 
   frontend()->sendRawCBORNotification(std::move(cbor));
diff --git a/chromium/components/ui_devtools/ui_devtools_unittest_utils.cc b/chromium/components/ui_devtools/ui_devtools_unittest_utils.cc
index f7b80a46ddd..c1f59fa0e7c 100644
--- a/chromium/components/ui_devtools/ui_devtools_unittest_utils.cc
+++ b/chromium/components/ui_devtools/ui_devtools_unittest_utils.cc
@@ -5,7 +5,7 @@
 #include "components/ui_devtools/ui_devtools_unittest_utils.h"
 
 #include "base/strings/string_util.h"
-#include "components/ui_devtools/devtools_protocol_encoding.h"
+#include "third_party/inspector_protocol/crdtp/json.h"
 
 namespace ui_devtools {
 
@@ -32,10 +32,10 @@ int FakeFrontendChannel::CountProtocolNotificationMessage(
 
 namespace {
 std::string SerializeToJSON(std::unique_ptr<protocol::Serializable> message) {
-  std::vector<uint8_t> cbor = message->serializeToBinary();
+  std::vector<uint8_t> cbor = std::move(*message).TakeSerialized();
   std::string json;
-  ::inspector_protocol_encoding::Status status =
-      ConvertCBORToJSON(::inspector_protocol_encoding::SpanFrom(cbor), &json);
+  crdtp::Status status =
+      crdtp::json::ConvertCBORToJSON(crdtp::SpanFrom(cbor), &json);
   DCHECK(status.ok()) << status.ToASCIIString();
   return json;
 }
diff --git a/chromium/components/ui_devtools/views/overlay_agent_views.cc b/chromium/components/ui_devtools/views/overlay_agent_views.cc
index 7bdb209a2a6..70f61fca581 100644
--- a/chromium/components/ui_devtools/views/overlay_agent_views.cc
+++ b/chromium/components/ui_devtools/views/overlay_agent_views.cc
@@ -578,7 +578,7 @@ void OverlayAgentViews::OnPaintLayer(const ui::PaintContext& context) {
   flags.setPathEffect(SkDashPathEffect::Make(intervals, 2, 0));
 
   if (!render_text_)
-    render_text_ = gfx::RenderText::CreateHarfBuzzInstance();
+    render_text_ = gfx::RenderText::CreateRenderText();
   DrawRulers(screen_bounds, canvas, render_text_.get());
 
   // Display guide lines if |highlight_rect_config_| is NO_DRAW.