Migrate most remaining Blink-variant typemaps to GN

This eliminates all but a few .typemap files for Blink-variant
typemaps, replacing them with direct GN target settings
instead.

Bug: 1059389
Change-Id: Id8276f3256ac36e3f2bfc4ee02b0732064a727cc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2315439Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Ken Rockot <rockot@google.com>
Cr-Commit-Position: refs/heads/master@{#791227}

mojo/public/mojom/base/BUILD.gn

@@ -456,5 +456,24 @@ mojom_component("base") {
       ]
       traits_public_deps = [ "//mojo/public/cpp/base" ]
     },
+    {
+      types = [
+        {
+          mojom = "mojo_base.mojom.BigString16"
+          cpp = "::WTF::String"
+          nullable_is_same_type = true
+          force_serialize = true
+        },
+        {
+          mojom = "mojo_base.mojom.String16"
+          cpp = "::WTF::String"
+          nullable_is_same_type = true
+          force_serialize = true
+        },
+      ]
+      traits_headers = [
+        "//third_party/blink/renderer/platform/mojo/string16_mojom_traits.h",
+      ]
+    },
   ]
 }

third_party/blink/common/feature_policy/OWNERS

@@ -6,5 +6,3 @@ loonybear@chromium.org
 
 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

third_party/blink/common/feature_policy/feature_policy.typemap

-# Copyright 2017 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 = "//third_party/blink/public/mojom/feature_policy/feature_policy.mojom"
-public_headers = [
-  "//third_party/blink/public/common/feature_policy/feature_policy_forward.h",
-]
-traits_headers = [
-  "//third_party/blink/common/feature_policy/feature_policy_mojom_traits.h",
-]
-type_mappings = [ "blink.mojom.ParsedFeaturePolicyDeclaration=::blink::ParsedFeaturePolicyDeclaration" ]

third_party/blink/common/frame/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
\ No newline at end of file

third_party/blink/common/frame/frame_policy.typemap

-# 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 = "//third_party/blink/public/mojom/frame/frame_policy.mojom"
-public_headers = [
-  "//third_party/blink/public/common/frame/frame_policy.h",
-  "//third_party/blink/public/common/feature_policy/policy_value.h",
-]
-traits_headers =
-    [ "//third_party/blink/common/frame/frame_policy_mojom_traits.h" ]
-type_mappings = [ "blink.mojom.FramePolicy=::blink::FramePolicy" ]

third_party/blink/common/typemaps.gni

@@ -4,9 +4,7 @@
 
 typemaps = [
   "//third_party/blink/common/bluetooth/web_bluetooth_device_id.typemap",
-  "//third_party/blink/common/feature_policy/feature_policy.typemap",
   "//third_party/blink/common/feature_policy/policy_value.typemap",
-  "//third_party/blink/common/frame/frame_policy.typemap",
   "//third_party/blink/common/messaging/cloneable_message.typemap",
   "//third_party/blink/common/messaging/transferable_message.typemap",
 ]

third_party/blink/public/common/loader/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
 
 # TEAM: loading-dev@chromium.org
 # COMPONENT: Blink>Loader

third_party/blink/public/common/loader/url_loader_factory_bundle.typemap

-# Copyright 2017 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 =
-    "//third_party/blink/public/mojom/loader/url_loader_factory_bundle.mojom"
-public_headers =
-    [ "//third_party/blink/public/common/loader/url_loader_factory_bundle.h" ]
-traits_headers = [
-  "//third_party/blink/public/common/loader/url_loader_factory_bundle_mojom_traits.h",
-  "//url/mojom/origin_mojom_traits.h",
-]
-
-type_mappings = [ "blink.mojom.URLLoaderFactoryBundle=::std::unique_ptr<::blink::PendingURLLoaderFactoryBundle>[move_only,nullable_is_same_type]" ]

third_party/blink/public/common/loader/url_loader_factory_bundle_mojom_traits.h

@@ -12,6 +12,7 @@
 #include "third_party/blink/public/common/common_export.h"
 #include "third_party/blink/public/common/loader/url_loader_factory_bundle.h"
 #include "third_party/blink/public/mojom/loader/url_loader_factory_bundle.mojom-shared.h"
+#include "url/mojom/origin_mojom_traits.h"
 
 namespace mojo {
 

third_party/blink/public/common/mediastream/OWNERS

@@ -3,8 +3,6 @@ hbos@chromium.org
 
 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
 
 # TEAM: webrtc-dev@chromium.org
 # COMPONENT: Blink>GetUserMedia

third_party/blink/public/common/mediastream/media_devices.typemap

-# Copyright 2018 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 = "//third_party/blink/public/mojom/mediastream/media_devices.mojom"
-
-public_headers = [
-  "//third_party/blink/public/common/mediastream/media_devices.h",
-  "//third_party/blink/public/common/common_export.h",
-]
-
-traits_headers = [
-  "//third_party/blink/public/common/mediastream/media_devices_mojom_traits.h",
-]
-
-type_mappings = [
-  "blink.mojom.MediaDeviceType=::blink::MediaDeviceType",
-  "blink.mojom.MediaDeviceInfo=::blink::WebMediaDeviceInfo",
-  "blink.mojom.FacingMode=::media::VideoFacingMode",
-]

third_party/blink/public/common/mediastream/media_stream.typemap

-# Copyright 2018 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 = "//third_party/blink/public/mojom/mediastream/media_stream.mojom"
-
-public_headers = [
-  "//third_party/blink/public/common/mediastream/media_stream_controls.h",
-  "//third_party/blink/public/common/mediastream/media_stream_request.h",
-  "//third_party/blink/public/common/common_export.h",
-]
-
-traits_headers = [
-  "//media/base/ipc/media_param_traits.h",
-  "//media/capture/mojom/video_capture_types_mojom_traits.h",
-  "//third_party/blink/public/common/mediastream/media_stream_mojom_traits.h",
-]
-
-type_mappings = [
-  "blink.mojom.MediaStreamDevice=::blink::MediaStreamDevice",
-  "blink.mojom.StreamControls=::blink::StreamControls",
-  "blink.mojom.TrackControls=::blink::TrackControls",
-]

third_party/blink/public/common/messaging/OWNERS

@@ -5,8 +5,6 @@ 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
 
 # TEAM: platform-architecture-dev@chromium.org
 # COMPONENT: Blink>Messaging

third_party/blink/public/common/messaging/message_port_descriptor.typemap

-# 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 =
-    "//third_party/blink/public/mojom/messaging/message_port_descriptor.mojom"
-public_headers =
-    [ "//third_party/blink/public/common/messaging/message_port_descriptor.h" ]
-traits_headers = [ "//third_party/blink/public/common/messaging/message_port_descriptor_mojom_traits.h" ]
-type_mappings = [
-  "blink.mojom.MessagePortDescriptor=::blink::MessagePortDescriptor[move_only]",
-]

third_party/blink/public/mojom/BUILD.gn

@@ -287,6 +287,60 @@ mojom("mojom_platform") {
       ]
       traits_headers = [ "//third_party/blink/public/common/input/web_coalesced_input_event_mojom_traits.h" ]
     },
+    {
+      types = [
+        {
+          mojom = "blink.mojom.ParsedFeaturePolicyDeclaration"
+          cpp = "::blink::ParsedFeaturePolicyDeclaration"
+        },
+      ]
+      traits_headers = [ "//third_party/blink/public/common/feature_policy/feature_policy_forward.h" ]
+      traits_private_headers = [ "//third_party/blink/common/feature_policy/feature_policy_mojom_traits.h" ]
+    },
+    {
+      types = [
+        {
+          mojom = "blink.mojom.FramePolicy"
+          cpp = "::blink::FramePolicy"
+        },
+      ]
+      traits_headers =
+          [ "//third_party/blink/common/frame/frame_policy_mojom_traits.h" ]
+    },
+    {
+      types = [
+        {
+          mojom = "blink.mojom.MediaDeviceType"
+          cpp = "::blink::MediaDeviceType"
+        },
+        {
+          mojom = "blink.mojom.MediaDeviceInfo"
+          cpp = "::blink::WebMediaDeviceInfo"
+        },
+        {
+          mojom = "blink.mojom.FacingMode"
+          cpp = "::media::VideoFacingMode"
+        },
+      ]
+      traits_headers = [ "//third_party/blink/public/common/mediastream/media_devices_mojom_traits.h" ]
+    },
+    {
+      types = [
+        {
+          mojom = "blink.mojom.MediaStreamDevice"
+          cpp = "::blink::MediaStreamDevice"
+        },
+        {
+          mojom = "blink.mojom.StreamControls"
+          cpp = "::blink::StreamControls"
+        },
+        {
+          mojom = "blink.mojom.TrackControls"
+          cpp = "::blink::TrackControls"
+        },
+      ]
+      traits_headers = [ "//third_party/blink/public/common/mediastream/media_stream_mojom_traits.h" ]
+    },
     {
       types = [
         {
@@ -316,6 +370,18 @@ mojom("mojom_platform") {
       ]
       traits_headers = [ "//third_party/blink/public/common/widget/device_emulation_params_mojom_traits.h" ]
     },
+    {
+      types = [
+        {
+          mojom = "blink.mojom.URLLoaderFactoryBundle"
+          cpp = "::std::unique_ptr<::blink::PendingURLLoaderFactoryBundle>"
+          nullable_is_same_type = true
+          move_only = true
+        },
+      ]
+      traits_headers = [ "//third_party/blink/public/common/loader/url_loader_factory_bundle_mojom_traits.h" ]
+      traits_public_deps = [ "//url/mojom:mojom_traits" ]
+    },
   ]
   cpp_typemaps = [
     {
@@ -340,6 +406,32 @@ mojom("mojom_platform") {
       traits_headers =
           [ "//third_party/blink/renderer/platform/mojo/drag_mojom_traits.h" ]
     },
+    {
+      types = [
+        {
+          mojom = "blink.mojom.FetchAPIRequestBody"
+          cpp = "::blink::ResourceRequestBody"
+          nullable_is_same_type = true
+          move_only = true
+        },
+      ]
+      traits_headers = [
+        "//third_party/blink/renderer/platform/loader/fetch/resource_request.h",
+      ]
+      traits_private_headers = [ "//third_party/blink/renderer/platform/loader/fetch/fetch_api_request_body_mojom_traits.h" ]
+    },
+    {
+      types = [
+        {
+          mojom = "blink.mojom.FetchAPIRequestHeaders"
+          cpp =
+              "::WTF::HashMap<::WTF::String, WTF::String, WTF::CaseFoldingHash>"
+          move_only = true
+        },
+      ]
+      traits_headers = [ "//third_party/blink/renderer/platform/mojo/fetch_api_request_headers_mojom_traits.h" ]
+      traits_public_deps = [ "//third_party/blink/renderer/platform/wtf" ]
+    },
   ]
   cpp_typemaps += shared_cpp_typemaps
   blink_cpp_typemaps += shared_cpp_typemaps
@@ -405,6 +497,19 @@ mojom("android_mojo_bindings") {
     public_deps += [ "//ui/gfx/geometry/mojom" ]
   }
 
+  blink_cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "blink.mojom.SerializedBlob"
+          cpp = "::scoped_refptr<::blink::BlobDataHandle>"
+          nullable_is_same_type = true
+        },
+      ]
+      traits_headers = [ "//third_party/blink/renderer/platform/blob/serialized_blob_mojom_traits.h" ]
+    },
+  ]
+
   export_class_attribute = "BLINK_COMMON_EXPORT"
   export_define = "BLINK_COMMON_IMPLEMENTATION=1"
   export_header = "third_party/blink/public/common/common_export.h"
@@ -502,6 +607,55 @@ mojom("mojom_core") {
     ]
   }
 
+  shared_cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "blink.mojom.MessagePortDescriptor"
+          cpp = "::blink::MessagePortDescriptor"
+          move_only = true
+        },
+      ]
+      traits_headers = [ "//third_party/blink/public/common/messaging/message_port_descriptor_mojom_traits.h" ]
+    },
+  ]
+
+  cpp_typemaps = shared_cpp_typemaps
+
+  blink_cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "blink.mojom.CloneableMessage"
+          cpp = "::blink::BlinkCloneableMessage"
+          move_only = true
+        },
+      ]
+      traits_headers = [ "//third_party/blink/renderer/core/messaging/blink_cloneable_message_mojom_traits.h" ]
+      traits_public_deps = [ "//third_party/blink/public/common" ]
+    },
+    {
+      types = [
+        {
+          mojom = "blink.mojom.TransferableMessage"
+          cpp = "::blink::BlinkTransferableMessage"
+          move_only = true
+        },
+        {
+          mojom = "blink.mojom.SerializedArrayBufferContents"
+          cpp = "::blink::ArrayBufferContents"
+          move_only = true
+        },
+      ]
+      traits_headers = [ "//third_party/blink/renderer/core/messaging/blink_transferable_message_mojom_traits.h" ]
+      traits_public_deps = [
+        "//third_party/blink/public/common",
+        "//third_party/blink/renderer/platform/wtf",
+      ]
+    },
+  ]
+  blink_cpp_typemaps += shared_cpp_typemaps
+
   overridden_deps_blink = [
     ":android_mojo_bindings",
     ":mojom_platform",
@@ -563,6 +717,26 @@ mojom("web_bluetooth_mojo_bindings") {
 
   public_deps = [ "//device/bluetooth/public/mojom" ]
 
+  blink_cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "blink.mojom.WebBluetoothDeviceId"
+          cpp = "::WTF::String"
+        },
+        {
+          mojom = "bluetooth.mojom.UUID"
+          cpp = "::WTF::String"
+          nullable_is_same_type = true
+        },
+      ]
+      traits_headers = [
+        "//third_party/blink/renderer/platform/mojo/bluetooth_mojom_traits.h",
+      ]
+      traits_public_deps = [ "//device/bluetooth" ]
+    },
+  ]
+
   # The chromium variant must be linked with content and use the same export
   # settings in component build because of the WebBluetoothDeviceId typemap
   # inside content.

third_party/blink/public/mojom/bluetooth/bluetooth.typemap

-# Copyright 2016 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 = "//third_party/blink/public/mojom/bluetooth/web_bluetooth.mojom"
-public_headers =
-    [ "//third_party/blink/renderer/platform/wtf/text/wtf_string.h" ]
-traits_headers =
-    [ "//third_party/blink/renderer/platform/mojo/bluetooth_mojom_traits.h" ]
-deps = [
-  "//device/bluetooth",
-]
-type_mappings = [
-  "blink.mojom.WebBluetoothDeviceId=::WTF::String",
-  "bluetooth.mojom.UUID=::WTF::String[nullable_is_same_type]",
-]

third_party/blink/public/public_typemaps.gni

@@ -7,11 +7,7 @@ typemaps = [
   "//third_party/blink/public/common/fetch/fetch_api_request_body.typemap",
   "//third_party/blink/public/common/fetch/fetch_api_request_headers.typemap",
   "//third_party/blink/public/common/indexeddb/indexed_db_default.typemap",
-  "//third_party/blink/public/common/loader/url_loader_factory_bundle.typemap",
   "//third_party/blink/public/common/manifest/manifest.typemap",
-  "//third_party/blink/public/common/mediastream/media_devices.typemap",
-  "//third_party/blink/public/common/mediastream/media_stream.typemap",
-  "//third_party/blink/public/common/messaging/message_port_descriptor.typemap",
   "//third_party/blink/public/common/notifications/notification_types.typemap",
   "//third_party/blink/public/common/peerconnection/peer_connection_tracker.typemap",
   "//third_party/blink/public/common/user_agent/user_agent_metadata.typemap",

third_party/blink/renderer/core/messaging/OWNERS

@@ -3,8 +3,6 @@ jbroman@chromium.org
 
 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
 
 # TEAM: platform-architecture-dev@chromium.org
 # COMPONENT: Blink>Messaging

third_party/blink/renderer/core/messaging/blink_cloneable_message.typemap

-# Copyright 2017 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 = "//third_party/blink/public/mojom/messaging/cloneable_message.mojom"
-public_headers =
-    [ "//third_party/blink/renderer/core/messaging/blink_cloneable_message.h" ]
-traits_headers = [ "//third_party/blink/renderer/core/messaging/blink_cloneable_message_mojom_traits.h" ]
-
-deps = [
-  "//mojo/public/cpp/bindings",
-  "//third_party/blink/public/common",
-]
-type_mappings =
-    [ "blink.mojom.CloneableMessage=::blink::BlinkCloneableMessage[move_only]" ]

third_party/blink/renderer/core/messaging/blink_cloneable_message_mojom_traits.cc

@@ -5,6 +5,7 @@
 #include "third_party/blink/renderer/core/messaging/blink_cloneable_message_mojom_traits.h"
 
 #include "mojo/public/cpp/base/big_buffer_mojom_traits.h"
+#include "third_party/blink/public/mojom/messaging/cloneable_message.mojom-blink.h"
 #include "third_party/blink/renderer/platform/blob/blob_data.h"
 
 namespace mojo {

third_party/blink/renderer/core/messaging/blink_cloneable_message_mojom_traits.h

@@ -9,7 +9,7 @@
 #include "mojo/public/cpp/base/unguessable_token_mojom_traits.h"
 #include "mojo/public/cpp/bindings/array_traits_wtf_vector.h"
 #include "mojo/public/cpp/bindings/string_traits_wtf.h"
-#include "third_party/blink/public/mojom/messaging/cloneable_message.mojom-blink.h"
+#include "third_party/blink/public/mojom/messaging/cloneable_message.mojom-shared.h"
 #include "third_party/blink/public/mojom/native_file_system/native_file_system_transfer_token.mojom-blink.h"
 #include "third_party/blink/renderer/bindings/core/v8/serialization/serialized_script_value.h"
 #include "third_party/blink/renderer/core/core_export.h"
@@ -20,7 +20,7 @@
 namespace mojo {
 
 template <>
-struct CORE_EXPORT StructTraits<blink::mojom::blink::CloneableMessage::DataView,
+struct CORE_EXPORT StructTraits<blink::mojom::CloneableMessageDataView,
                                 blink::BlinkCloneableMessage> {
   static mojo_base::BigBuffer encoded_message(
       blink::BlinkCloneableMessage& input) {
@@ -65,7 +65,7 @@ struct CORE_EXPORT StructTraits<blink::mojom::blink::CloneableMessage::DataView,
     return std::move(input.message->NativeFileSystemTokens());
   }
 
-  static bool Read(blink::mojom::blink::CloneableMessage::DataView,
+  static bool Read(blink::mojom::CloneableMessageDataView,
                    blink::BlinkCloneableMessage* out);
 };
 

third_party/blink/renderer/core/messaging/blink_transferable_message.typemap

-# Copyright 2017 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 = "//third_party/blink/public/mojom/messaging/transferable_message.mojom"
-public_headers = [
-  "//third_party/blink/renderer/core/messaging/blink_transferable_message.h",
-]
-traits_headers = [ "//third_party/blink/renderer/core/messaging/blink_transferable_message_mojom_traits.h" ]
-
-deps = [
-  "//mojo/public/cpp/bindings",
-  "//third_party/blink/public/common",
-  "//third_party/blink/renderer/platform/wtf",
-]
-type_mappings = [
-  "blink.mojom.TransferableMessage=::blink::BlinkTransferableMessage[move_only]",
-  "blink.mojom.SerializedArrayBufferContents=::blink::ArrayBufferContents[move_only]",
-]

third_party/blink/renderer/core/messaging/blink_transferable_message_mojom_traits.cc

@@ -5,6 +5,7 @@
 #include "third_party/blink/renderer/core/messaging/blink_transferable_message_mojom_traits.h"
 
 #include "mojo/public/cpp/base/big_buffer_mojom_traits.h"
+#include "third_party/blink/public/mojom/messaging/transferable_message.mojom-blink.h"
 #include "third_party/blink/renderer/core/imagebitmap/image_bitmap.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 

third_party/blink/renderer/core/messaging/blink_transferable_message_mojom_traits.h

@@ -10,7 +10,7 @@
 #include "third_party/blink/public/common/messaging/message_port_channel.h"
 #include "third_party/blink/public/common/messaging/message_port_descriptor.h"
 #include "third_party/blink/public/common/messaging/message_port_descriptor_mojom_traits.h"
-#include "third_party/blink/public/mojom/messaging/transferable_message.mojom-blink.h"
+#include "third_party/blink/public/mojom/messaging/transferable_message.mojom-shared.h"
 #include "third_party/blink/renderer/bindings/core/v8/serialization/serialized_script_value.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/messaging/blink_cloneable_message_mojom_traits.h"
@@ -19,9 +19,8 @@
 namespace mojo {
 
 template <>
-struct CORE_EXPORT
-    StructTraits<blink::mojom::blink::TransferableMessage::DataView,
-                 blink::BlinkTransferableMessage> {
+struct CORE_EXPORT StructTraits<blink::mojom::TransferableMessageDataView,
+                                blink::BlinkTransferableMessage> {
   static blink::BlinkCloneableMessage& message(
       blink::BlinkTransferableMessage& input) {
     return input;
@@ -64,13 +63,13 @@ struct CORE_EXPORT
     return input.transfer_user_activation;
   }
 
-  static bool Read(blink::mojom::blink::TransferableMessage::DataView,
+  static bool Read(blink::mojom::TransferableMessageDataView,
                    blink::BlinkTransferableMessage* out);
 };
 
 template <>
 class CORE_EXPORT
-    StructTraits<blink::mojom::blink::SerializedArrayBufferContents::DataView,
+    StructTraits<blink::mojom::SerializedArrayBufferContentsDataView,
                  blink::ArrayBufferContents> {
  public:
   static mojo_base::BigBuffer contents(
@@ -80,7 +79,7 @@ class CORE_EXPORT
     return mojo_base::BigBuffer(
         base::make_span(allocation_start, array_buffer_contents.DataLength()));
   }
-  static bool Read(blink::mojom::blink::SerializedArrayBufferContents::DataView,
+  static bool Read(blink::mojom::SerializedArrayBufferContentsDataView,
                    blink::ArrayBufferContents* out);
 };
 

third_party/blink/renderer/platform/blob/OWNERS

@@ -2,8 +2,6 @@ file://storage/browser/blob/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
 
 # TEAM: storage-dev@chromium.org
 # COMPONENT: Blink>Storage>FileAPI

third_party/blink/renderer/platform/blob/serialized_blob.typemap

-# Copyright 2018 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 = "//third_party/blink/public/mojom/blob/serialized_blob.mojom"
-public_headers = [ "//third_party/blink/renderer/platform/blob/blob_data.h" ]
-traits_headers = [
-  "//third_party/blink/renderer/platform/blob/serialized_blob_mojom_traits.h",
-]
-
-deps = [
-  "//mojo/public/cpp/bindings",
-]
-type_mappings = [ "blink.mojom.SerializedBlob=::scoped_refptr<::blink::BlobDataHandle>[nullable_is_same_type]" ]

third_party/blink/renderer/platform/blob/serialized_blob_mojom_traits.cc

@@ -4,6 +4,8 @@
 
 #include "third_party/blink/renderer/platform/blob/serialized_blob_mojom_traits.h"
 
+#include "third_party/blink/public/mojom/blob/serialized_blob.mojom-blink.h"
+
 namespace mojo {
 
 bool StructTraits<blink::mojom::blink::SerializedBlob::DataView,

third_party/blink/renderer/platform/blob/serialized_blob_mojom_traits.h

@@ -8,16 +8,15 @@
 #include "base/memory/ref_counted.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/string_traits_wtf.h"
-#include "third_party/blink/public/mojom/blob/serialized_blob.mojom-blink.h"
+#include "third_party/blink/public/mojom/blob/serialized_blob.mojom-shared.h"
 #include "third_party/blink/renderer/platform/blob/blob_data.h"
 #include "third_party/blink/renderer/platform/platform_export.h"
 
 namespace mojo {
 
 template <>
-struct PLATFORM_EXPORT
-    StructTraits<blink::mojom::blink::SerializedBlob::DataView,
-                 scoped_refptr<blink::BlobDataHandle>> {
+struct PLATFORM_EXPORT StructTraits<blink::mojom::SerializedBlobDataView,
+                                    scoped_refptr<blink::BlobDataHandle>> {
   static bool IsNull(const scoped_refptr<blink::BlobDataHandle>& input) {
     return !input;
   }
@@ -44,7 +43,7 @@ struct PLATFORM_EXPORT
     return input->CloneBlobRemote();
   }
 
-  static bool Read(blink::mojom::blink::SerializedBlob::DataView,
+  static bool Read(blink::mojom::SerializedBlobDataView,
                    scoped_refptr<blink::BlobDataHandle>* out);
 };
 

third_party/blink/renderer/platform/loader/fetch/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
 

third_party/blink/renderer/platform/loader/fetch/fetch_api_request_body.typemap

-# Copyright 2020 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 = "//third_party/blink/public/mojom/fetch/fetch_api_request.mojom"
-public_headers =
-    [ "//third_party/blink/renderer/platform/loader/fetch/resource_request.h" ]
-traits_headers = [ "//third_party/blink/renderer/platform/loader/fetch/fetch_api_request_body_mojom_traits.h" ]
-
-type_mappings = [ "blink.mojom.FetchAPIRequestBody=::blink::ResourceRequestBody[nullable_is_same_type,move_only]" ]

third_party/blink/renderer/platform/mojo/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

third_party/blink/renderer/platform/mojo/blink_typemaps.gni

@@ -3,20 +3,6 @@
 # found in the LICENSE file.
 
 typemaps = [
-  "//third_party/blink/common/feature_policy/feature_policy.typemap",
-  "//third_party/blink/common/frame/frame_policy.typemap",
-  "//third_party/blink/public/common/loader/url_loader_factory_bundle.typemap",
-  "//third_party/blink/public/common/messaging/message_port_descriptor.typemap",
-  "//third_party/blink/renderer/core/messaging/blink_cloneable_message.typemap",
-  "//third_party/blink/renderer/core/messaging/blink_transferable_message.typemap",
   "//third_party/blink/renderer/modules/indexeddb/indexed_db_blink.typemap",
-  "//third_party/blink/renderer/platform/blob/serialized_blob.typemap",
   "//third_party/blink/renderer/platform/cookie/canonical_cookie.typemap",
-  "//third_party/blink/renderer/platform/loader/fetch/fetch_api_request_body.typemap",
-  "//third_party/blink/renderer/platform/mojo/fetch_api_request_headers.typemap",
-  "//third_party/blink/renderer/platform/mojo/string.typemap",
-  "//third_party/blink/renderer/platform/mojo/time.typemap",
-  "//third_party/blink/public/common/mediastream/media_devices.typemap",
-  "//third_party/blink/public/common/mediastream/media_stream.typemap",
-  "//third_party/blink/public/mojom/bluetooth/bluetooth.typemap",
 ]

third_party/blink/renderer/platform/mojo/fetch_api_request_headers.typemap

-# Copyright 2018 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 = "//third_party/blink/public/mojom/fetch/fetch_api_request.mojom"
-public_headers = [
-  "//third_party/blink/renderer/platform/wtf/hash_map.h",
-  "//third_party/blink/renderer/platform/wtf/text/string_hash.h",
-  "//third_party/blink/renderer/platform/wtf/text/wtf_string.h",
-]
-traits_headers = [ "//third_party/blink/renderer/platform/mojo/fetch_api_request_headers_mojom_traits.h" ]
-
-deps = [
-  "//third_party/blink/renderer/platform/wtf",
-]
-type_mappings = [ "blink.mojom.FetchAPIRequestHeaders=::WTF::HashMap<::WTF::String, WTF::String, WTF::CaseFoldingHash>[move_only]" ]

third_party/blink/renderer/platform/mojo/fetch_api_request_headers_mojom_traits.h

@@ -5,7 +5,8 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_MOJO_FETCH_API_REQUEST_HEADERS_MOJOM_TRAITS_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_MOJO_FETCH_API_REQUEST_HEADERS_MOJOM_TRAITS_H_
 
-#include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink-forward.h"
+#include "mojo/public/cpp/bindings/map_traits_wtf_hash_map.h"
+#include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-shared.h"
 #include "third_party/blink/renderer/platform/wtf/hash_map.h"
 #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
 
@@ -13,7 +14,7 @@ namespace mojo {
 
 template <>
 struct StructTraits<
-    blink::mojom::blink::FetchAPIRequestHeaders::DataView,
+    blink::mojom::FetchAPIRequestHeadersDataView,
     WTF::HashMap<WTF::String, WTF::String, WTF::CaseFoldingHash>> {
   static WTF::HashMap<WTF::String, WTF::String> headers(
       const WTF::HashMap<WTF::String, WTF::String, WTF::CaseFoldingHash>&
@@ -25,7 +26,7 @@ struct StructTraits<
   }
 
   static bool Read(
-      blink::mojom::blink::FetchAPIRequestHeaders::DataView in,
+      blink::mojom::FetchAPIRequestHeadersDataView in,
       WTF::HashMap<WTF::String, WTF::String, WTF::CaseFoldingHash>* out) {
     WTF::HashMap<WTF::String, WTF::String> in_headers;
     if (!in.ReadHeaders(&in_headers))

third_party/blink/renderer/platform/mojo/string.typemap

-# Copyright 2016 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 = "//mojo/public/mojom/base/string16.mojom"
-public_headers =
-    [ "//third_party/blink/renderer/platform/wtf/text/wtf_string.h" ]
-traits_headers =
-    [ "//third_party/blink/renderer/platform/mojo/string16_mojom_traits.h" ]
-type_mappings = [
-  "mojo_base.mojom.BigString16=::WTF::String[nullable_is_same_type,force_serialize]",
-  "mojo_base.mojom.String16=::WTF::String[nullable_is_same_type,force_serialize]",
-]

third_party/blink/renderer/platform/mojo/string16_mojom_traits.h

@@ -10,6 +10,7 @@
 #include "mojo/public/cpp/bindings/struct_traits.h"
 #include "mojo/public/mojom/base/string16.mojom-blink.h"
 #include "third_party/blink/renderer/platform/platform_export.h"
+#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
 
 namespace mojo_base {
 class BigBuffer;

third_party/blink/renderer/platform/mojo/time.typemap

-# Copyright 2017 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 = "//mojo/public/mojom/base/time.mojom"
-traits_headers = [
-  "//ipc/ipc_message_utils.h",
-  "//mojo/public/cpp/base/time_mojom_traits.h",
-]
-public_deps = [
-  "//ipc",
-  "//mojo/public/mojom/base",
-]
-
-type_mappings = [
-  "mojo_base.mojom.Time=::base::Time[copyable_pass_by_value]",
-  "mojo_base.mojom.TimeDelta=::base::TimeDelta[copyable_pass_by_value]",
-]