Remove //content typemap files

This merges all remaining typemap configs in //content into their
respective mojom target definitions.

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

content/browser/typemaps.gni

-# 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 = [
-  "//content/browser/webauth/authenticator.typemap",
-  "//content/browser/webauth/virtual_authenticator.typemap",
-]

content/browser/webauth/OWNERS

 file://device/fido/OWNERS
 mkwst@chromium.org
 
-per-file *_type_converter*.*=set noparent
-per-file *_type_converter*.*=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: identity-dev@chromium.org
 # COMPONENT: Blink>WebAuthentication

content/browser/webauth/authenticator.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/webauthn/authenticator.mojom"
-public_headers = [
-  "//device/fido/authenticator_selection_criteria.h",
-  "//device/fido/fido_transport_protocol.h",
-  "//device/fido/cable/cable_discovery_data.h",
-  "//device/fido/public_key_credential_descriptor.h",
-  "//device/fido/public_key_credential_params.h",
-  "//device/fido/public_key_credential_rp_entity.h",
-  "//device/fido/public_key_credential_user_entity.h",
-  "//device/fido/fido_types.h",
-]
-traits_headers = [ "//content/browser/webauth/authenticator_mojom_traits.h" ]
-sources = [
-  "//content/browser/webauth/authenticator_mojom_traits.cc",
-  "//content/browser/webauth/authenticator_mojom_traits.h",
-]
-public_deps = [
-  "//device/fido",
-]
-type_mappings = [
-  "blink.mojom.AuthenticatorTransport=::device::FidoTransportProtocol",
-  "blink.mojom.PublicKeyCredentialType=::device::CredentialType",
-  "blink.mojom.PublicKeyCredentialParameters=::device::PublicKeyCredentialParams::CredentialInfo",
-  "blink.mojom.PublicKeyCredentialDescriptor=::device::PublicKeyCredentialDescriptor",
-  "blink.mojom.AuthenticatorAttachment=::device::AuthenticatorAttachment",
-  "blink.mojom.UserVerificationRequirement=::device::UserVerificationRequirement",
-  "blink.mojom.AuthenticatorSelectionCriteria=::device::AuthenticatorSelectionCriteria",
-  "blink.mojom.PublicKeyCredentialRpEntity=::device::PublicKeyCredentialRpEntity",
-  "blink.mojom.PublicKeyCredentialUserEntity=::device::PublicKeyCredentialUserEntity",
-  "blink.mojom.CableAuthentication=::device::CableDiscoveryData",
-  "blink.mojom.AttestationConveyancePreference=::device::AttestationConveyancePreference",
-]

content/browser/webauth/authenticator_mojom_traits.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "authenticator_mojom_traits.h"
+#include "content/browser/webauth/authenticator_mojom_traits.h"  // nogncheck
 
 #include "url/mojom/url_gurl_mojom_traits.h"
 

content/browser/webauth/authenticator_mojom_traits.h

@@ -23,7 +23,7 @@
 #include "mojo/public/cpp/bindings/enum_traits.h"
 #include "mojo/public/cpp/bindings/struct_traits.h"
 #include "third_party/blink/public/common/common_export.h"
-#include "third_party/blink/public/mojom/webauthn/authenticator.mojom.h"
+#include "third_party/blink/public/mojom/webauthn/authenticator.mojom-shared.h"
 
 namespace mojo {
 

content/browser/webauth/virtual_authenticator.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/webauthn/virtual_authenticator.mojom"
-public_headers = [ "//device/fido/fido_types.h" ]
-traits_headers =
-    [ "//content/browser/webauth/virtual_authenticator_mojom_traits.h" ]
-sources = [
-  "//content/browser/webauth/virtual_authenticator_mojom_traits.cc",
-  "//content/browser/webauth/virtual_authenticator_mojom_traits.h",
-]
-public_deps = [
-  "//device/fido",
-]
-type_mappings = [
-  "blink.test.mojom.ClientToAuthenticatorProtocol=::device::ProtocolVersion",
-]

content/browser/webauth/virtual_authenticator_mojom_traits.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "virtual_authenticator_mojom_traits.h"
+#include "content/browser/webauth/virtual_authenticator_mojom_traits.h"  // nogncheck
 
 namespace mojo {
 

content/public/common/BUILD.gn

@@ -288,6 +288,17 @@ source_set("common_sources") {
   }
 }
 
+_common_param_traits_headers = [ "common_param_traits_macros.h" ]
+_common_param_traits_deps = [
+  "//ipc",
+  "//services/network/public/cpp:cpp_base",
+  "//services/network/public/mojom",
+  "//third_party/blink/public:blink_headers",
+  "//ui/accessibility:ax_enums_mojo",
+  "//ui/base",
+  "//ui/gfx/ipc",
+]
+
 mojom("interfaces") {
   # We don't want Blink variants of these bindings to be generated.
   disable_variants = true
@@ -333,6 +344,46 @@ mojom("interfaces") {
 
   overridden_deps = [ "//third_party/blink/public/mojom:mojom_platform" ]
   component_deps = [ "//third_party/blink/public/common" ]
+
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "content.mojom.BrowserControlsState"
+          cpp = "::content::BrowserControlsState"
+        },
+      ]
+      traits_headers = [ "browser_controls_state.h" ]
+      traits_private_headers = _common_param_traits_headers
+      traits_deps = _common_param_traits_deps
+    },
+    {
+      types = [
+        {
+          mojom = "content.mojom.DropData"
+          cpp = "::content::DropData"
+        },
+      ]
+      traits_headers = [ "drop_data.h" ]
+      traits_private_headers = _common_param_traits_headers
+      traits_deps = _common_param_traits_deps
+    },
+    {
+      types = [
+        {
+          mojom = "content.mojom.WebPluginInfo"
+          cpp = "::content::WebPluginInfo"
+        },
+      ]
+      traits_headers = [ "webplugininfo.h" ]
+      traits_private_headers = [ "webplugininfo_param_traits.h" ]
+      traits_public_deps = [
+        "//base",
+        "//skia",
+      ]
+      traits_deps = [ "//ipc" ]
+    },
+  ]
 }
 
 mojom("renderer_type") {
@@ -350,6 +401,22 @@ mojom("web_preferences_mojom") {
 
   overridden_deps = [ "//third_party/blink/public/mojom:mojom_platform" ]
   component_deps = [ "//third_party/blink/public/common" ]
+
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "content.mojom.WebPreferences"
+          cpp = "::blink::web_pref::WebPreferences"
+        },
+      ]
+      traits_headers = [
+        "//third_party/blink/public/common/web_preferences/web_preferences.h",
+      ]
+      traits_private_headers = _common_param_traits_headers
+      traits_deps = _common_param_traits_deps
+    },
+  ]
 }
 
 mojom("service_names") {

content/public/common/OWNERS

@@ -8,8 +8,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
 per-file *_type_converter*.*=set noparent
 per-file *_type_converter*.*=file://ipc/SECURITY_OWNERS
 per-file sandbox*=set noparent

content/public/common/browser_controls_state.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 = "//content/public/common/browser_controls_state.mojom"
-public_headers = [ "//content/public/common/browser_controls_state.h" ]
-traits_headers = [ "//content/public/common/common_param_traits_macros.h" ]
-public_deps = [
-  # Since the typemappings for browser_controls_state, drop_data and
-  # web_features are all implemented in the monolithic common_param_traits, we
-  # need to duplicate these dependencies into all three typemaps.
-  # Note that we also have a dependency on
-  # //third_party/blink/public/mojom:mojom_platform, but we can't include that
-  # dependency here because we need to override it to support component build.
-
-  "//base",
-  "//ipc",
-  "//services/network/public/cpp:cpp_base",
-  "//services/network/public/mojom",
-  "//third_party/blink/public:blink_headers",
-  "//ui/accessibility:ax_enums_mojo",
-  "//ui/base",
-  "//ui/gfx/ipc",
-  "//ui/surface",
-]
-type_mappings =
-    [ "content.mojom.BrowserControlsState=::content::BrowserControlsState" ]

content/public/common/drop_data.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 = "//content/public/common/drop_data.mojom"
-public_headers = [ "//content/public/common/drop_data.h" ]
-traits_headers = [ "//content/public/common/common_param_traits_macros.h" ]
-public_deps = [
-  # Since the typemappings for browser_controls_state, drop_data and
-  # web_features are all implemented in the monolithic common_param_traits, we
-  # need to duplicate these dependencies into all three typemaps.
-  # Note that we also have a dependency on
-  # //third_party/blink/public/mojom:mojom_platform, but we can't include that
-  # dependency here because we need to override it to support component build.
-
-  "//base",
-  "//ipc",
-  "//services/network/public/cpp:cpp_base",
-  "//services/network/public/mojom",
-  "//third_party/blink/public:blink_headers",
-  "//ui/accessibility:ax_enums_mojo",
-  "//ui/base",
-  "//ui/gfx/ipc",
-  "//ui/surface",
-]
-type_mappings = [ "content.mojom.DropData=::content::DropData" ]

content/public/common/typemaps.gni

-# 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.
-
-typemaps = [
-  "//content/public/common/browser_controls_state.typemap",
-  "//content/public/common/drop_data.typemap",
-  "//content/public/common/web_preferences.typemap",
-  "//content/public/common/webplugininfo.typemap",
-]

content/public/common/web_preferences.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 = "//content/public/common/web_preferences.mojom"
-public_headers =
-    [ "//third_party/blink/public/common/web_preferences/web_preferences.h" ]
-traits_headers = [ "//content/public/common/common_param_traits_macros.h" ]
-public_deps = [
-  # Since the typemappings for browser_controls_state, drop_data and
-  # web_features are all implemented in the monolithic common_param_traits, we
-  # need to duplicate these dependencies into all three typemaps.
-  # Note that we also have a dependency on
-  # //third_party/blink/public/mojom:mojom_platform, but we can't include that
-  # dependency here because we need to override it to support component build.
-
-  "//base",
-  "//ipc",
-  "//services/network/public/cpp:cpp_base",
-  "//services/network/public/mojom",
-  "//third_party/blink/public:blink_headers",
-  "//third_party/blink/public/common:headers",
-  "//ui/accessibility:ax_enums_mojo",
-  "//ui/base",
-  "//ui/gfx/ipc",
-  "//ui/surface",
-]
-type_mappings =
-    [ "content.mojom.WebPreferences=::blink::web_pref::WebPreferences" ]

content/public/common/webplugininfo.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 = "//content/public/common/webplugininfo.mojom"
-public_headers = [ "//content/public/common/webplugininfo.h" ]
-traits_headers = [ "//content/public/common/webplugininfo_param_traits.h" ]
-public_deps = [
-  "//ipc",
-  "//skia",
-]
-
-type_mappings = [ "content.mojom.WebPluginInfo=::content::WebPluginInfo" ]

mojo/public/tools/bindings/chromium_bindings_configuration.gni

@@ -2,11 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-_typemap_imports = [
-  "//chrome/typemaps.gni",
-  "//content/browser/typemaps.gni",
-  "//content/public/common/typemaps.gni",
-]
+_typemap_imports = [ "//chrome/typemaps.gni" ]
 
 _typemaps = []
 foreach(typemap_import, _typemap_imports) {

third_party/blink/public/mojom/BUILD.gn

@@ -663,6 +663,65 @@ mojom("android_mojo_bindings") {
     public_deps += [ "//ui/gfx/geometry/mojom" ]
   }
 
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "blink.mojom.AuthenticatorTransport"
+          cpp = "::device::FidoTransportProtocol"
+        },
+        {
+          mojom = "blink.mojom.PublicKeyCredentialType"
+          cpp = "::device::CredentialType"
+        },
+        {
+          mojom = "blink.mojom.PublicKeyCredentialParameters"
+          cpp = "::device::PublicKeyCredentialParams::CredentialInfo"
+        },
+        {
+          mojom = "blink.mojom.PublicKeyCredentialDescriptor"
+          cpp = "::device::PublicKeyCredentialDescriptor"
+        },
+        {
+          mojom = "blink.mojom.AuthenticatorAttachment"
+          cpp = "::device::AuthenticatorAttachment"
+        },
+        {
+          mojom = "blink.mojom.UserVerificationRequirement"
+          cpp = "::device::UserVerificationRequirement"
+        },
+        {
+          mojom = "blink.mojom.AuthenticatorSelectionCriteria"
+          cpp = "::device::AuthenticatorSelectionCriteria"
+        },
+        {
+          mojom = "blink.mojom.PublicKeyCredentialRpEntity"
+          cpp = "::device::PublicKeyCredentialRpEntity"
+        },
+        {
+          mojom = "blink.mojom.PublicKeyCredentialUserEntity"
+          cpp = "::device::PublicKeyCredentialUserEntity"
+        },
+        {
+          mojom = "blink.mojom.CableAuthentication"
+          cpp = "::device::CableDiscoveryData"
+        },
+        {
+          mojom = "blink.mojom.AttestationConveyancePreference"
+          cpp = "::device::AttestationConveyancePreference"
+        },
+      ]
+      traits_headers =
+          [ "//content/browser/webauth/authenticator_mojom_traits.h" ]
+      traits_sources =
+          [ "//content/browser/webauth/authenticator_mojom_traits.cc" ]
+      traits_public_deps = [
+        "//base",
+        "//device/fido",
+      ]
+    },
+  ]
+
   blink_cpp_typemaps = [
     {
       types = [
@@ -1168,6 +1227,22 @@ mojom("authenticator_test_mojo_bindings") {
 
   # Don't scramble message IDs so they are redistributable to external tests.
   scramble_message_ids = false
+
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "blink.test.mojom.ClientToAuthenticatorProtocol"
+          cpp = "::device::ProtocolVersion"
+        },
+      ]
+      traits_headers =
+          [ "//content/browser/webauth/virtual_authenticator_mojom_traits.h" ]
+      traits_sources =
+          [ "//content/browser/webauth/virtual_authenticator_mojom_traits.cc" ]
+      traits_public_deps = [ "//device/fido" ]
+    },
+  ]
 }
 
 mojom("memory_usage_monitor_linux_mojo_bindings") {