Remove //chrome/chrome_cleaner typemaps

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

Bug: 1059389
Change-Id: I9882de654483126a8f9c048eade521fbbe4e918f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2407034
Commit-Queue: Ken Rockot <rockot@google.com>
Reviewed-by: Daniel Rubery <drubery@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#807233}

chrome/chrome_cleaner/mojom/BUILD.gn

@@ -30,10 +30,42 @@ chrome_cleaner_mojom("chrome_prompt_interface") {
 
 chrome_cleaner_mojom("footprints_interface") {
   sources = [ "footprints.mojom" ]
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "chrome_cleaner.mojom.FilePath"
+          cpp = "::base::FilePath"
+        },
+        {
+          mojom = "chrome_cleaner.mojom.RegistryKey"
+          cpp = "::std::wstring"
+        },
+        {
+          mojom = "chrome_cleaner.mojom.ExtensionId"
+          cpp = "::std::wstring"
+        },
+      ]
+      traits_headers = [ "typemaps/footprints_mojom_traits.h" ]
+      traits_sources = [ "typemaps/footprints_mojom_traits.cc" ]
+    },
+  ]
 }
 
 chrome_cleaner_mojom("wstring") {
   sources = [ "wstring.mojom" ]
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "chrome_cleaner.mojom.WString"
+          cpp = "::std::wstring"
+        },
+      ]
+      traits_headers = [ "typemaps/wstring_mojom_traits.h" ]
+      traits_sources = [ "typemaps/wstring_mojom_traits.cc" ]
+    },
+  ]
 }
 
 chrome_cleaner_mojom("engine_sandbox_interface") {
@@ -51,6 +83,54 @@ chrome_cleaner_mojom("engine_sandbox_interface") {
     ":wstring",
     "//mojo/public/mojom/base",
   ]
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "chrome_cleaner.mojom.TraceLocation"
+          cpp = "::chrome_cleaner::UwS::TraceLocation"
+        },
+        {
+          mojom = "chrome_cleaner.mojom.PUP"
+          cpp = "::chrome_cleaner::PUPData::PUP"
+        },
+      ]
+      traits_headers = [ "typemaps/pup_mojom_traits.h" ]
+      traits_sources = [ "typemaps/pup_mojom_traits.cc" ]
+      traits_public_deps = [
+        "//chrome/chrome_cleaner/os:common_os",
+        "//chrome/chrome_cleaner/proto:shared_pup_enums_proto",
+        "//chrome/chrome_cleaner/pup_data:pup_data_base",
+        "//chrome/chrome_cleaner/settings:settings",
+      ]
+    },
+    {
+      types = [
+        {
+          mojom = "chrome_cleaner.mojom.WStringEmbeddedNulls"
+          cpp = "::chrome_cleaner::WStringEmbeddedNulls"
+        },
+      ]
+      traits_headers = [ "typemaps/wstring_embedded_nulls_mojom_traits.h" ]
+      traits_sources = [ "typemaps/wstring_embedded_nulls_mojom_traits.cc" ]
+    },
+    {
+      types = [
+        {
+          mojom = "chrome_cleaner.mojom.PredefinedHandle"
+          cpp = "::HANDLE"
+          copyable_pass_by_value = true
+        },
+        {
+          mojom = "chrome_cleaner.mojom.WindowsHandle"
+          cpp = "::HANDLE"
+          copyable_pass_by_value = true
+        },
+      ]
+      traits_headers = [ "typemaps/windows_handle_mojom_traits.h" ]
+      traits_sources = [ "typemaps/windows_handle_mojom_traits.cc" ]
+    },
+  ]
 }
 
 chrome_cleaner_mojom("parser_interface") {

chrome/chrome_cleaner/mojom/typemaps/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

chrome/chrome_cleaner/mojom/typemaps/footprints.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 = "//chrome/chrome_cleaner/mojom/footprints.mojom"
-public_headers = [ "//base/files/file_path.h" ]
-traits_headers =
-    [ "//chrome/chrome_cleaner/mojom/typemaps/footprints_mojom_traits.h" ]
-sources =
-    [ "//chrome/chrome_cleaner/mojom/typemaps/footprints_mojom_traits.cc" ]
-
-type_mappings = [
-  "chrome_cleaner.mojom.FilePath=::base::FilePath",
-  "chrome_cleaner.mojom.RegistryKey=::std::wstring",
-  "chrome_cleaner.mojom.ExtensionId=::std::wstring",
-]

chrome/chrome_cleaner/mojom/typemaps/footprints_mojom_traits.h

@@ -9,7 +9,7 @@
 
 #include "base/containers/span.h"
 #include "base/files/file_path.h"
-#include "chrome/chrome_cleaner/mojom/footprints.mojom.h"
+#include "chrome/chrome_cleaner/mojom/footprints.mojom-shared.h"
 
 namespace mojo {
 

chrome/chrome_cleaner/mojom/typemaps/pup.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 = "//chrome/chrome_cleaner/mojom/pup.mojom"
-
-public_headers = [ "//chrome/chrome_cleaner/pup_data/pup_data.h" ]
-
-public_deps = [
-  "//chrome/chrome_cleaner/os:common_os",
-  "//chrome/chrome_cleaner/proto:shared_pup_enums_proto",
-  "//chrome/chrome_cleaner/pup_data:pup_data_base",
-  "//chrome/chrome_cleaner/settings:settings",
-  "//mojo/public/cpp/bindings:struct_traits",
-]
-
-traits_headers = [ "//chrome/chrome_cleaner/mojom/typemaps/pup_mojom_traits.h" ]
-sources = [
-  "//chrome/chrome_cleaner/mojom/typemaps/pup_mojom_traits.cc",
-]
-
-type_mappings = [
-  "chrome_cleaner.mojom.TraceLocation=::chrome_cleaner::UwS::TraceLocation",
-  "chrome_cleaner.mojom.PUP=::chrome_cleaner::PUPData::PUP",
-]

chrome/chrome_cleaner/mojom/typemaps/pup_mojom_traits.h

@@ -7,8 +7,9 @@
 
 #include <stdint.h>
 
-#include "chrome/chrome_cleaner/mojom/pup.mojom.h"
+#include "chrome/chrome_cleaner/mojom/pup.mojom-shared.h"
 #include "chrome/chrome_cleaner/os/file_path_set.h"
+#include "chrome/chrome_cleaner/pup_data/pup_data.h"
 #include "mojo/public/cpp/bindings/array_traits_stl.h"
 #include "mojo/public/cpp/bindings/struct_traits.h"
 

chrome/chrome_cleaner/mojom/typemaps/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 = [
-  "//chrome/chrome_cleaner/mojom/typemaps/footprints.typemap",
-  "//chrome/chrome_cleaner/mojom/typemaps/pup.typemap",
-  "//chrome/chrome_cleaner/mojom/typemaps/wstring.typemap",
-  "//chrome/chrome_cleaner/mojom/typemaps/wstring_embedded_nulls.typemap",
-  "//chrome/chrome_cleaner/mojom/typemaps/windows_handle.typemap",
-]

chrome/chrome_cleaner/mojom/typemaps/windows_handle.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 = "//chrome/chrome_cleaner/mojom/windows_handle.mojom"
-public_headers = []
-traits_headers =
-    [ "//chrome/chrome_cleaner/mojom/typemaps/windows_handle_mojom_traits.h" ]
-sources = [
-  "//chrome/chrome_cleaner/mojom/typemaps/windows_handle_mojom_traits.cc",
-]
-
-type_mappings = [
-  "chrome_cleaner.mojom.PredefinedHandle=::HANDLE[copyable_pass_by_value]",
-  "chrome_cleaner.mojom.WindowsHandle=::HANDLE[copyable_pass_by_value]",
-]

chrome/chrome_cleaner/mojom/typemaps/windows_handle_mojom_traits.h

@@ -5,7 +5,7 @@
 #ifndef CHROME_CHROME_CLEANER_MOJOM_TYPEMAPS_WINDOWS_HANDLE_MOJOM_TRAITS_H_
 #define CHROME_CHROME_CLEANER_MOJOM_TYPEMAPS_WINDOWS_HANDLE_MOJOM_TRAITS_H_
 
-#include "chrome/chrome_cleaner/mojom/windows_handle.mojom.h"
+#include "chrome/chrome_cleaner/mojom/windows_handle.mojom-shared.h"
 #include "mojo/public/cpp/bindings/union_traits.h"
 
 namespace mojo {

chrome/chrome_cleaner/mojom/typemaps/wstring.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 = "//chrome/chrome_cleaner/mojom/wstring.mojom"
-traits_headers =
-    [ "//chrome/chrome_cleaner/mojom/typemaps/wstring_mojom_traits.h" ]
-sources = [ "//chrome/chrome_cleaner/mojom/typemaps/wstring_mojom_traits.cc" ]
-
-type_mappings = [ "chrome_cleaner.mojom.WString=::std::wstring" ]

chrome/chrome_cleaner/mojom/typemaps/wstring_embedded_nulls.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 = "//chrome/chrome_cleaner/mojom/wstring_embedded_nulls.mojom"
-public_headers = [ "//chrome/chrome_cleaner/strings/wstring_embedded_nulls.h" ]
-traits_headers = [ "//chrome/chrome_cleaner/mojom/typemaps/wstring_embedded_nulls_mojom_traits.h" ]
-sources = [ "//chrome/chrome_cleaner/mojom/typemaps/wstring_embedded_nulls_mojom_traits.cc" ]
-
-type_mappings = [ "chrome_cleaner.mojom.WStringEmbeddedNulls=::chrome_cleaner::WStringEmbeddedNulls" ]

chrome/chrome_cleaner/mojom/typemaps/wstring_embedded_nulls_mojom_traits.h

@@ -8,7 +8,7 @@
 #include <stdint.h>
 
 #include "base/containers/span.h"
-#include "chrome/chrome_cleaner/mojom/wstring_embedded_nulls.mojom.h"
+#include "chrome/chrome_cleaner/mojom/wstring_embedded_nulls.mojom-shared.h"
 #include "chrome/chrome_cleaner/strings/wstring_embedded_nulls.h"
 #include "mojo/public/cpp/bindings/struct_traits.h"
 #include "mojo/public/cpp/bindings/union_traits.h"

chrome/chrome_cleaner/mojom/typemaps/wstring_mojom_traits.h

@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/containers/span.h"
-#include "chrome/chrome_cleaner/mojom/wstring.mojom.h"
+#include "chrome/chrome_cleaner/mojom/wstring.mojom-shared.h"
 #include "mojo/public/cpp/bindings/struct_traits.h"
 
 namespace mojo {

mojo/public/tools/bindings/chromium_bindings_configuration.gni

@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 _typemap_imports = [
-  "//chrome/chrome_cleaner/mojom/typemaps/typemaps.gni",
   "//chrome/common/importer/typemaps.gni",
   "//chrome/typemaps.gni",
   "//chromecast/typemaps.gni",