Remove //chromeos .typemap files

The typemapping configs are merged into their respective mojom targets
definitions.

Bug: 1059389
Change-Id: I38f8ae3b3786316d05a8fc68cfc5f4a0ecd01765
Tbr: khorimoto@chromium.org
Tbr: pmoy@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2407033
Commit-Queue: Ken Rockot <rockot@google.com>
Reviewed-by: Paul Moy <pmoy@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: Sam McNally <sammc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#807223}

chromeos/components/drivefs/OWNERS

@@ -4,6 +4,4 @@ slangley@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
 # COMPONENT: Platform>Apps>FileManager

chromeos/components/drivefs/drivefs.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 = "//chromeos/components/drivefs/mojom/drivefs.mojom"
-public_headers = [ "//components/drive/file_errors.h" ]
-traits_headers = [ "//chromeos/components/drivefs/drivefs_mojom_traits.h" ]
-sources = [
-  "//chromeos/components/drivefs/drivefs_mojom_traits.cc",
-  "//chromeos/components/drivefs/drivefs_mojom_traits.h",
-]
-deps = [
-  "//components/drive",
-]
-
-type_mappings = [ "drivefs.mojom.FileError=::drive::FileError" ]

chromeos/components/drivefs/mojom/BUILD.gn

@@ -14,4 +14,23 @@ mojom_component("mojom") {
 
   output_prefix = "drivefs_mojom"
   macro_prefix = "DRIVEFS_MOJOM"
+
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "drivefs.mojom.FileError"
+          cpp = "::drive::FileError"
+        },
+      ]
+      traits_headers =
+          [ "//chromeos/components/drivefs/drivefs_mojom_traits.h" ]
+      traits_sources =
+          [ "//chromeos/components/drivefs/drivefs_mojom_traits.cc" ]
+      traits_public_deps = [
+        "//base",
+        "//components/drive",
+      ]
+    },
+  ]
 }

chromeos/components/multidevice/BUILD.gn

@@ -31,9 +31,13 @@ static_library("multidevice") {
     "//base:i18n",
     "//chromeos/components/multidevice/logging",
     "//chromeos/dbus",
-    "//chromeos/services/device_sync/proto",
     "//chromeos/services/device_sync/proto:util",
     "//components/prefs",
+  ]
+
+  public_deps = [
+    "//base",
+    "//chromeos/services/device_sync/proto",
     "//third_party/securemessage/proto",
   ]
 }

chromeos/components/multidevice/mojom/BUILD.gn

@@ -6,8 +6,36 @@ import("//mojo/public/tools/bindings/mojom.gni")
 
 mojom("mojom") {
   sources = [ "multidevice_types.mojom" ]
-
   public_deps = [ "//mojo/public/mojom/base" ]
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "chromeos.multidevice.mojom.BeaconSeed"
+          cpp = "::chromeos::multidevice::BeaconSeed"
+        },
+        {
+          mojom = "chromeos.multidevice.mojom.RemoteDevice"
+          cpp = "::chromeos::multidevice::RemoteDevice"
+        },
+        {
+          mojom = "chromeos.multidevice.mojom.SoftwareFeature"
+          cpp = "::chromeos::multidevice::SoftwareFeature"
+        },
+      ]
+      traits_headers = [ "multidevice_mojom_traits.h" ]
+      traits_sources = [ "multidevice_mojom_traits.cc" ]
+      traits_public_deps = [
+        "//base",
+        "//chromeos/components/multidevice",
+      ]
+      traits_deps = [
+        "//chromeos/components/multidevice/logging",
+        "//chromeos/services/device_sync/proto",
+        "//device/bluetooth/public/cpp",
+      ]
+    },
+  ]
 }
 
 source_set("unit_tests") {

chromeos/components/multidevice/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

chromeos/components/multidevice/mojom/multidevice.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 = "//chromeos/components/multidevice/mojom/multidevice_types.mojom"
-
-public_headers = [
-  "//chromeos/components/multidevice/beacon_seed.h",
-  "//chromeos/components/multidevice/remote_device.h",
-  "//chromeos/components/multidevice/software_feature.h",
-]
-
-traits_headers =
-    [ "//chromeos/components/multidevice/mojom/multidevice_mojom_traits.h" ]
-
-sources = [
-  "//chromeos/components/multidevice/mojom/multidevice_mojom_traits.cc",
-  "//chromeos/components/multidevice/mojom/multidevice_mojom_traits.h",
-]
-
-public_deps = [
-  "//chromeos/components/multidevice",
-  "//chromeos/components/multidevice/logging",
-  "//chromeos/services/device_sync/proto",
-  "//device/bluetooth/public/cpp",
-]
-
-type_mappings = [
-  "chromeos.multidevice.mojom.BeaconSeed=::chromeos::multidevice::BeaconSeed",
-  "chromeos.multidevice.mojom.RemoteDevice=::chromeos::multidevice::RemoteDevice",
-  "chromeos.multidevice.mojom.SoftwareFeature=::chromeos::multidevice::SoftwareFeature",
-]

chromeos/components/multidevice/mojom/multidevice_mojom_traits.h

@@ -10,7 +10,7 @@
 
 #include "base/time/time.h"
 #include "chromeos/components/multidevice/beacon_seed.h"
-#include "chromeos/components/multidevice/mojom/multidevice_types.mojom.h"
+#include "chromeos/components/multidevice/mojom/multidevice_types.mojom-shared.h"
 #include "chromeos/components/multidevice/remote_device.h"
 #include "chromeos/components/multidevice/software_feature.h"
 #include "chromeos/components/multidevice/software_feature_state.h"

chromeos/components/multidevice/mojom/typemaps.gni

-# 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.
-
-typemaps = [ "//chromeos/components/multidevice/mojom/multidevice.typemap" ]

chromeos/components/smbfs/OWNERS

@@ -2,6 +2,4 @@ file://ui/file_manager/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
 # COMPONENT: Platform>Apps>FileManager

chromeos/services/cros_healthd/public/mojom/BUILD.gn

@@ -17,4 +17,18 @@ mojom("mojom") {
     "//chromeos/services/network_health/public/mojom",
     "//mojo/public/mojom/base",
   ]
+
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "chromeos.cros_healthd_probe.mojom.CpuArchitectureEnum"
+          cpp = "::em::CpuInfo::Architecture"
+        },
+      ]
+      traits_headers = [ "cros_healthd_probe_mojom_traits.h" ]
+      traits_sources = [ "cros_healthd_probe_mojom_traits.cc" ]
+      traits_public_deps = [ "//components/policy/proto" ]
+    },
+  ]
 }

chromeos/services/cros_healthd/public/mojom/OWNERS

@@ -3,5 +3,3 @@ per-file *.mojom=file://ipc/SECURITY_OWNERS
 per-file *.mojom=file://chromeos/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
\ No newline at end of file

chromeos/services/cros_healthd/public/mojom/cros_healthd_probe.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 = "//chromeos/services/cros_healthd/public/mojom/cros_healthd_probe.mojom"
-
-public_headers = [ "//components/policy/proto/device_management_backend.pb.h" ]
-
-traits_headers = [ "//chromeos/services/cros_healthd/public/mojom/cros_healthd_probe_mojom_traits.h" ]
-
-sources = [
-  "//chromeos/services/cros_healthd/public/mojom/cros_healthd_probe_mojom_traits.cc",
-  "//chromeos/services/cros_healthd/public/mojom/cros_healthd_probe_mojom_traits.h",
-]
-
-public_deps = [
-  "//components/policy/proto",
-]
-
-type_mappings = [ "chromeos.cros_healthd_probe.mojom.CpuArchitectureEnum=em::CpuInfo::Architecture" ]

chromeos/services/cros_healthd/public/mojom/cros_healthd_probe_mojom_traits.h

@@ -5,7 +5,7 @@
 #ifndef CHROMEOS_SERVICES_CROS_HEALTHD_PUBLIC_MOJOM_CROS_HEALTHD_PROBE_MOJOM_TRAITS_H_
 #define CHROMEOS_SERVICES_CROS_HEALTHD_PUBLIC_MOJOM_CROS_HEALTHD_PROBE_MOJOM_TRAITS_H_
 
-#include "chromeos/services/cros_healthd/public/mojom/cros_healthd_probe.mojom.h"
+#include "chromeos/services/cros_healthd/public/mojom/cros_healthd_probe.mojom-shared.h"
 #include "components/policy/proto/device_management_backend.pb.h"
 #include "mojo/public/cpp/bindings/enum_traits.h"
 

chromeos/services/cros_healthd/public/mojom/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 = [
-  "//chromeos/services/cros_healthd/public/mojom/cros_healthd_probe.typemap",
-]

chromeos/services/device_sync/public/mojom/BUILD.gn

@@ -11,6 +11,31 @@ mojom("mojom") {
     "//chromeos/components/multidevice/mojom",
     "//mojo/public/mojom/base",
   ]
+
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "chromeos.device_sync.mojom.ConnectivityStatus"
+          cpp = "cryptauthv2::ConnectivityStatus"
+        },
+        {
+          mojom = "chromeos.device_sync.mojom.FeatureStatusChange"
+          cpp = "chromeos::device_sync::FeatureStatusChange"
+        },
+        {
+          mojom = "chromeos.device_sync.mojom.CryptAuthService"
+          cpp = "cryptauthv2::TargetService"
+        },
+      ]
+      traits_headers = [ "device_sync_mojom_traits.h" ]
+      traits_sources = [ "device_sync_mojom_traits.cc" ]
+      traits_public_deps = [
+        "//chromeos/services/device_sync:feature_status_change",
+        "//chromeos/services/device_sync/proto",
+      ]
+    },
+  ]
 }
 
 source_set("unit_tests") {

chromeos/services/device_sync/public/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
\ No newline at end of file

chromeos/services/device_sync/public/mojom/device_sync.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 = "//chromeos/services/device_sync/public/mojom/device_sync.mojom"
-
-public_headers = [
-  "//chromeos/services/device_sync/feature_status_change.h",
-  "//chromeos/services/device_sync/proto/cryptauth_devicesync.pb.h",
-]
-
-traits_headers = [
-  "//chromeos/services/device_sync/public/mojom/device_sync_mojom_traits.h",
-]
-
-sources = [
-  "//chromeos/services/device_sync/public/mojom/device_sync_mojom_traits.cc",
-  "//chromeos/services/device_sync/public/mojom/device_sync_mojom_traits.h",
-]
-
-public_deps = [
-  "//chromeos/services/device_sync:feature_status_change",
-  "//chromeos/services/device_sync/proto",
-]
-
-type_mappings = [
-  "chromeos.device_sync.mojom.ConnectivityStatus=cryptauthv2::ConnectivityStatus",
-  "chromeos.device_sync.mojom.FeatureStatusChange=chromeos::device_sync::FeatureStatusChange",
-  "chromeos.device_sync.mojom.CryptAuthService=cryptauthv2::TargetService",
-]

chromeos/services/device_sync/public/mojom/device_sync_mojom_traits.h

@@ -8,7 +8,7 @@
 #include "chromeos/services/device_sync/feature_status_change.h"
 #include "chromeos/services/device_sync/proto/cryptauth_common.pb.h"
 #include "chromeos/services/device_sync/proto/cryptauth_devicesync.pb.h"
-#include "chromeos/services/device_sync/public/mojom/device_sync.mojom.h"
+#include "chromeos/services/device_sync/public/mojom/device_sync.mojom-shared.h"
 #include "mojo/public/cpp/bindings/enum_traits.h"
 
 namespace mojo {

chromeos/services/device_sync/public/mojom/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 =
-    [ "//chromeos/services/device_sync/public/mojom/device_sync.typemap" ]

chromeos/services/network_config/public/mojom/BUILD.gn

@@ -15,6 +15,20 @@ mojom("mojom") {
     "//mojo/public/mojom/base",
     "//services/network/public/mojom:mojom_ip_address",
   ]
+
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "chromeos.cros_network_config.mojom.ProxyMode"
+          cpp = "::ProxyPrefs::ProxyMode"
+        },
+      ]
+      traits_headers = [ "cros_network_config_mojom_traits.h" ]
+      traits_sources = [ "cros_network_config_mojom_traits.cc" ]
+      traits_public_deps = [ "//components/proxy_config" ]
+    },
+  ]
 }
 
 mojom("network_types") {

chromeos/services/network_config/public/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

chromeos/services/network_config/public/mojom/cros_network_config.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 =
-    "//chromeos/services/network_config/public/mojom/cros_network_config.mojom"
-
-public_deps = [
-  "//components/proxy_config",
-]
-
-traits_headers = [ "//chromeos/services/network_config/public/mojom/cros_network_config_mojom_traits.h" ]
-
-type_mappings =
-    [ "chromeos.cros_network_config.mojom.ProxyMode=::ProxyPrefs::ProxyMode" ]
-
-sources = [
-  "//chromeos/services/network_config/public/mojom/cros_network_config_mojom_traits.cc",
-  "//chromeos/services/network_config/public/mojom/cros_network_config_mojom_traits.h",
-]

chromeos/services/network_config/public/mojom/cros_network_config_mojom_traits.h

@@ -5,7 +5,7 @@
 #ifndef CHROMEOS_SERVICES_NETWORK_CONFIG_PUBLIC_MOJOM_CROS_NETWORK_CONFIG_MOJOM_TRAITS_H_
 #define CHROMEOS_SERVICES_NETWORK_CONFIG_PUBLIC_MOJOM_CROS_NETWORK_CONFIG_MOJOM_TRAITS_H_
 
-#include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h"
+#include "chromeos/services/network_config/public/mojom/cros_network_config.mojom-shared.h"
 #include "components/proxy_config/proxy_prefs.h"
 #include "mojo/public/cpp/bindings/enum_traits.h"
 

chromeos/services/network_config/public/mojom/typemaps.gni

-# 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.
-
-typemaps = [
-  "//chromeos/services/network_config/public/mojom/cros_network_config.typemap",
-]

chromeos/services/secure_channel/BUILD.gn

@@ -153,6 +153,7 @@ static_library("secure_channel") {
     "//chromeos",
     "//chromeos/components/multidevice",
     "//chromeos/components/multidevice/logging",
+    "//chromeos/services/device_sync/proto",
     "//chromeos/services/secure_channel/public/cpp/shared",
     "//chromeos/services/secure_channel/public/mojom",
     "//crypto",

chromeos/services/secure_channel/public/mojom/BUILD.gn

@@ -11,6 +11,26 @@ mojom("mojom") {
     "//chromeos/components/multidevice/mojom",
     "//mojo/public/mojom/base",
   ]
+
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "chromeos.secure_channel.mojom.ConnectionMedium"
+          cpp = "::chromeos::secure_channel::ConnectionMedium"
+        },
+        {
+          mojom = "chromeos.secure_channel.mojom.ConnectionPriority"
+          cpp = "::chromeos::secure_channel::ConnectionPriority"
+        },
+      ]
+
+      traits_headers = [ "secure_channel_mojom_traits.h" ]
+      traits_sources = [ "secure_channel_mojom_traits.cc" ]
+      traits_public_deps =
+          [ "//chromeos/services/secure_channel/public/cpp/shared" ]
+    },
+  ]
 }
 
 source_set("unit_tests") {

chromeos/services/secure_channel/public/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

chromeos/services/secure_channel/public/mojom/secure_channel.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 = "//chromeos/services/secure_channel/public/mojom/secure_channel.mojom"
-
-public_headers = [
-  "//chromeos/services/secure_channel/public/cpp/shared/connection_medium.h",
-  "//chromeos/services/secure_channel/public/cpp/shared/connection_priority.h",
-]
-
-traits_headers = [ "//chromeos/services/secure_channel/public/mojom/secure_channel_mojom_traits.h" ]
-
-sources = [
-  "//chromeos/services/secure_channel/public/mojom/secure_channel_mojom_traits.cc",
-  "//chromeos/services/secure_channel/public/mojom/secure_channel_mojom_traits.h",
-]
-
-public_deps = [ "//chromeos/services/secure_channel/public/cpp/shared" ]
-
-type_mappings = [
-  "chromeos.secure_channel.mojom.ConnectionMedium=::chromeos::secure_channel::ConnectionMedium",
-  "chromeos.secure_channel.mojom.ConnectionPriority=::chromeos::secure_channel::ConnectionPriority",
-]

chromeos/services/secure_channel/public/mojom/secure_channel_mojom_traits.h

@@ -7,7 +7,7 @@
 
 #include "chromeos/services/secure_channel/public/cpp/shared/connection_medium.h"
 #include "chromeos/services/secure_channel/public/cpp/shared/connection_priority.h"
-#include "chromeos/services/secure_channel/public/mojom/secure_channel.mojom.h"
+#include "chromeos/services/secure_channel/public/mojom/secure_channel.mojom-shared.h"
 #include "mojo/public/cpp/bindings/enum_traits.h"
 
 namespace mojo {

chromeos/services/secure_channel/public/mojom/typemaps.gni

-# 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.
-
-typemaps =
-    [ "//chromeos/services/secure_channel/public/mojom/secure_channel.typemap" ]

chromeos/typemaps.gni

-# 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.
-
-typemaps = [ "//chromeos/components/drivefs/drivefs.typemap" ]

mojo/public/tools/bindings/chromium_bindings_configuration.gni

@@ -7,12 +7,6 @@ _typemap_imports = [
   "//chrome/common/importer/typemaps.gni",
   "//chrome/typemaps.gni",
   "//chromecast/typemaps.gni",
-  "//chromeos/typemaps.gni",
-  "//chromeos/components/multidevice/mojom/typemaps.gni",
-  "//chromeos/services/cros_healthd/public/mojom/typemaps.gni",
-  "//chromeos/services/device_sync/public/mojom/typemaps.gni",
-  "//chromeos/services/network_config/public/mojom/typemaps.gni",
-  "//chromeos/services/secure_channel/public/mojom/typemaps.gni",
   "//content/browser/typemaps.gni",
   "//content/public/common/typemaps.gni",
 ]