BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 56 insertions, 8 deletions

diff --git a/chromium/chromecast/external_mojo/external_service_support/BUILD.gn b/chromium/chromecast/external_mojo/external_service_support/BUILD.gn
index 7c3f4cb0cda..9d6f3fc22b4 100644
--- a/chromium/chromecast/external_mojo/external_service_support/BUILD.gn
+++ b/chromium/chromecast/external_mojo/external_service_support/BUILD.gn
@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//chromecast/chromecast.gni")
+
 source_set("external_service") {
   sources = [
     "external_connector.h",
@@ -32,14 +34,57 @@ source_set("process_setup") {
   ]
 
   if (!is_fuchsia) {
-    sources += [
-      "crash_reporter_client.cc",
-      "crash_reporter_client.h",
-    ]
-    deps += [
-      "//chromecast/crash",
-      "//components/crash/core/app",
-    ]
+    sources += [ "crash_reporter_client.h" ]
+
+    if (use_system_crash_handler) {
+      sources += [ "crash_reporter_system.cc" ]
+      deps += [ "//third_party/crashpad/crashpad/client" ]
+    } else {
+      sources += [ "crash_reporter_builtin.cc" ]
+      deps += [
+        "//chromecast/crash",
+        "//components/crash/core/app",
+      ]
+    }
+  }
+}
+
+source_set("tracing_client_hdr") {
+  sources = [ "tracing_client.h" ]
+}
+
+source_set("tracing_client_dummy") {
+  sources = [
+    "tracing_client_dummy.cc",
+    "tracing_client_dummy.h",
+  ]
+  deps = [ ":tracing_client_hdr" ]
+}
+
+source_set("tracing_client_impl") {
+  sources = [
+    "tracing_client_impl.cc",
+    "tracing_client_impl.h",
+  ]
+  deps = [
+    ":external_service",
+    ":tracing_client_hdr",
+    "//base",
+    "//chromecast:chromecast_buildflags",
+    "//mojo/public/cpp/bindings",
+    "//services/tracing:lib",
+    "//services/tracing/public/cpp",
+    "//services/tracing/public/cpp:traced_process",
+    "//services/tracing/public/mojom",
+  ]
+}
+
+group("tracing_client") {
+  public_deps = [ ":tracing_client_hdr" ]
+  if (enable_external_mojo_tracing) {
+    public_deps += [ ":tracing_client_impl" ]
+  } else {
+    public_deps += [ ":tracing_client_dummy" ]
   }
 }
 
@@ -52,6 +97,7 @@ source_set("standalone_service_main") {
   deps = [
     ":external_service",
     ":process_setup",
+    ":tracing_client",
     "//base",
     "//chromecast/external_mojo/public/cpp:common",
     "//mojo/core/embedder",
@@ -77,7 +123,9 @@ source_set("chromium_service") {
 executable("standalone_mojo_broker") {
   sources = [ "standalone_mojo_broker.cc" ]
   deps = [
+    ":external_service",
     ":process_setup",
+    ":tracing_client",
     "//base",
     "//chromecast/external_mojo/public/cpp:common",
     "//chromecast/external_mojo/public/cpp:external_mojo_broker",