BASELINE: Update Chromium to 85.0.4183.14085-based

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

4 files changed, 20 insertions, 23 deletions

diff --git a/chromium/fuchsia/mojom/BUILD.gn b/chromium/fuchsia/mojom/BUILD.gn
index d06caabf100..ed7c1eb4f85 100644
--- a/chromium/fuchsia/mojom/BUILD.gn
+++ b/chromium/fuchsia/mojom/BUILD.gn
@@ -10,6 +10,26 @@ import("//testing/test.gni")
 mojom("example_interfaces") {
   testonly = true
   sources = [ "example.mojom" ]
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "fuchsia.test.mojom.TestInterfaceRequest"
+          cpp = "::fidl::InterfaceRequest<::base::fuchsia::testfidl::TestInterface>"
+          move_only = true
+        },
+      ]
+
+      traits_headers = [
+        "//base/fuchsia/testfidl/cpp/fidl.h",
+        "//fuchsia/mojom/test_interface_request_mojom_traits.h",
+      ]
+      traits_public_deps = [
+        ":traits",
+        "//base:testfidl",
+      ]
+    },
+  ]
 }
 
 source_set("traits") {
diff --git a/chromium/fuchsia/mojom/OWNERS b/chromium/fuchsia/mojom/OWNERS
index ae29a36aac8..1feb5149750 100644
--- a/chromium/fuchsia/mojom/OWNERS
+++ b/chromium/fuchsia/mojom/OWNERS
@@ -2,5 +2,3 @@ per-file *.mojom=set noparent
 per-file *.mojom=file://ipc/SECURITY_OWNERS
 per-file *_mojom_traits*.*=set noparent
 per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS
-per-file *.typemap=set noparent
-per-file *.typemap=file://ipc/SECURITY_OWNERS
diff --git a/chromium/fuchsia/mojom/example.typemap b/chromium/fuchsia/mojom/example.typemap
deleted file mode 100644
index 7e2aaac3df0..00000000000
--- a/chromium/fuchsia/mojom/example.typemap
+++ /dev/null
@@ -1,16 +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.
-
-mojom = "//fuchsia/mojom/example.mojom"
-os_whitelist = [ "fuchsia" ]
-public_headers = [ "base/fuchsia/testfidl/cpp/fidl.h" ]
-traits_headers = [ "//fuchsia/mojom/test_interface_request_mojom_traits.h" ]
-sources = [
-  "//fuchsia/mojom/test_interface_request_mojom_traits.h",
-]
-public_deps = [
-  "//base:testfidl",
-  "//fuchsia/mojom:traits",
-]
-type_mappings = [ "fuchsia.test.mojom.TestInterfaceRequest=::fidl::InterfaceRequest<::base::fuchsia::testfidl::TestInterface>[move_only]" ]
diff --git a/chromium/fuchsia/mojom/test_typemaps.gni b/chromium/fuchsia/mojom/test_typemaps.gni
deleted file mode 100644
index 521c8d4f8fb..00000000000
--- a/chromium/fuchsia/mojom/test_typemaps.gni
+++ /dev/null
@@ -1,5 +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.
-
-typemaps = [ "//fuchsia/mojom/example.typemap" ]