Remove //components/typemaps.gni

All typemaps listed here are deleted and their configurations are merged
into their respective mojom targets.

Bug: 1059389
Change-Id: I94cd40f48f7ee80de7f284bf446d4e9e80939810
Tbr: xiyuan@chromium.org
Tbr: estade@chromium.org
Tbr: changwan@chromium.org
Tbr: engedy@chromium.org
Tbr: dschuff@chromium.org
Tbr: jdoerrie@chromium.org
Tbr: jds@chromium.org
Tbr: megjablon@chromium.org
Tbr: blundell@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2405438Reviewed-by: Evan Stade <estade@chromium.org>
Reviewed-by: Derek Schuff <dschuff@chromium.org>
Reviewed-by: Jan Wilken Dörrie <jdoerrie@chromium.org>
Reviewed-by: Changwan Ryu <changwan@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Reviewed-by: Megan Jablonski <megjablon@chromium.org>
Reviewed-by: Colin Blundell <blundell@chromium.org>
Reviewed-by: Balazs Engedy <engedy@chromium.org>
Commit-Queue: Ken Rockot <rockot@google.com>
Cr-Commit-Position: refs/heads/master@{#807148}

components/account_id/mojom/BUILD.gn

@@ -6,4 +6,21 @@ import("//mojo/public/tools/bindings/mojom.gni")
 
 mojom("mojom") {
   sources = [ "account_id.mojom" ]
+
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "signin.mojom.AccountType"
+          cpp = "::AccountType"
+        },
+        {
+          mojom = "signin.mojom.AccountId"
+          cpp = "::AccountId"
+        },
+      ]
+      traits_headers = [ "account_id_traits.h" ]
+      traits_public_deps = [ "//components/account_id" ]
+    },
+  ]
 }

components/account_id/mojom/OWNERS

 per-file *.mojom=set noparent
 per-file *.mojom=file://ipc/SECURITY_OWNERS
-per-file *.typemap=set noparent
-per-file *.typemap=file://ipc/SECURITY_OWNERS

components/account_id/mojom/account_id.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 = "//components/account_id/mojom/account_id.mojom"
-public_headers = [ "//components/account_id/account_id.h" ]
-traits_headers = [ "//components/account_id/mojom/account_id_traits.h" ]
-public_deps = [
-  "//components/account_id",
-]
-type_mappings = [
-  "signin.mojom.AccountType=::AccountType",
-  "signin.mojom.AccountId=::AccountId",
-]

components/autofill/core/common/mojom/BUILD.gn

@@ -14,6 +14,83 @@ mojom("mojo_types") {
     "//url/mojom:url_mojom_gurl",
     "//url/mojom:url_mojom_origin",
   ]
+
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "autofill.mojom.FormData"
+          cpp = "::autofill::FormData"
+        },
+        {
+          mojom = "autofill.mojom.FormDataPredictions"
+          cpp = "::autofill::FormDataPredictions"
+        },
+        {
+          mojom = "autofill.mojom.FormFieldData"
+          cpp = "::autofill::FormFieldData"
+        },
+        {
+          mojom = "autofill.mojom.FormFieldDataPredictions"
+          cpp = "::autofill::FormFieldDataPredictions"
+        },
+        {
+          mojom = "autofill.mojom.FormsPredictionsMap"
+          cpp = "::autofill::FormsPredictionsMap"
+        },
+        {
+          mojom = "autofill.mojom.FormRendererId"
+          cpp = "::autofill::FormRendererId"
+          copyable_pass_by_value = true
+        },
+        {
+          mojom = "autofill.mojom.FieldRendererId"
+          cpp = "::autofill::FieldRendererId"
+          copyable_pass_by_value = true
+        },
+        {
+          mojom = "autofill.mojom.ParsingResult"
+          cpp = "::autofill::ParsingResult"
+        },
+        {
+          mojom = "autofill.mojom.PasswordAndMetadata"
+          cpp = "::autofill::PasswordAndMetadata"
+        },
+        {
+          mojom = "autofill.mojom.PasswordForm"
+          cpp = "::autofill::PasswordForm"
+        },
+        {
+          mojom = "autofill.mojom.PasswordFormFieldPredictionMap"
+          cpp = "::autofill::PasswordFormFieldPredictionMap"
+        },
+        {
+          mojom = "autofill.mojom.PasswordFormFillData"
+          cpp = "::autofill::PasswordFormFillData"
+        },
+        {
+          mojom = "autofill.mojom.PasswordFormGenerationData"
+          cpp = "::autofill::PasswordFormGenerationData"
+        },
+        {
+          mojom = "autofill.mojom.PasswordGenerationUIData"
+          cpp = "::autofill::password_generation::PasswordGenerationUIData"
+        },
+        {
+          mojom = "autofill.mojom.ValueElementPair"
+          cpp = "::autofill::ValueElementPair"
+        },
+      ]
+      traits_headers = [ "autofill_types_mojom_traits.h" ]
+      traits_sources = [ "autofill_types_mojom_traits.cc" ]
+      traits_public_deps = [
+        "//base",
+        "//base:i18n",
+        "//components/autofill/core/common",
+        "//ui/gfx/geometry/mojom:mojom_traits",
+      ]
+    },
+  ]
 }
 
 mojom("mojo_test_types") {

components/autofill/core/common/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

components/autofill/core/common/mojom/autofill_types.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 = "//components/autofill/core/common/mojom/autofill_types.mojom"
-public_headers = [
-  "//components/autofill/core/common/form_data.h",
-  "//components/autofill/core/common/form_data_predictions.h",
-  "//components/autofill/core/common/form_field_data.h",
-  "//components/autofill/core/common/form_field_data_predictions.h",
-  "//components/autofill/core/common/password_form.h",
-  "//components/autofill/core/common/password_form_fill_data.h",
-  "//components/autofill/core/common/password_form_generation_data.h",
-  "//components/autofill/core/common/password_generation_util.h",
-  "//components/autofill/core/common/renderer_id.h",
-]
-traits_headers =
-    [ "//components/autofill/core/common/mojom/autofill_types_mojom_traits.h" ]
-sources =
-    [ "//components/autofill/core/common/mojom/autofill_types_mojom_traits.cc" ]
-deps = [
-  "//base",
-  "//base:i18n",
-  "//components/autofill/core/common",
-  "//ui/gfx/geometry/mojom:mojom_traits",
-]
-
-type_mappings = [
-  "autofill.mojom.FormData=::autofill::FormData",
-  "autofill.mojom.FormDataPredictions=::autofill::FormDataPredictions",
-  "autofill.mojom.FormFieldData=::autofill::FormFieldData",
-  "autofill.mojom.FormFieldDataPredictions=::autofill::FormFieldDataPredictions",
-  "autofill.mojom.FormsPredictionsMap=::autofill::FormsPredictionsMap",
-  "autofill.mojom.FormRendererId=::autofill::FormRendererId[copyable_pass_by_value]",
-  "autofill.mojom.FieldRendererId=::autofill::FieldRendererId[copyable_pass_by_value]",
-  "autofill.mojom.ParsingResult=::autofill::ParsingResult",
-  "autofill.mojom.PasswordAndMetadata=::autofill::PasswordAndMetadata",
-  "autofill.mojom.PasswordForm=::autofill::PasswordForm",
-  "autofill.mojom.PasswordFormFieldPredictionMap=::autofill::PasswordFormFieldPredictionMap",
-  "autofill.mojom.PasswordFormFillData=::autofill::PasswordFormFillData",
-  "autofill.mojom.PasswordFormGenerationData=::autofill::PasswordFormGenerationData",
-  "autofill.mojom.PasswordGenerationUIData=::autofill::password_generation::PasswordGenerationUIData",
-  "autofill.mojom.ValueElementPair=::autofill::ValueElementPair",
-]

components/autofill/core/common/mojom/autofill_types_mojom_traits.h

@@ -16,7 +16,7 @@
 #include "components/autofill/core/common/form_data_predictions.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/autofill/core/common/form_field_data_predictions.h"
-#include "components/autofill/core/common/mojom/autofill_types.mojom.h"
+#include "components/autofill/core/common/mojom/autofill_types.mojom-shared.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/autofill/core/common/password_form_fill_data.h"
 #include "components/autofill/core/common/password_form_generation_data.h"

components/content_capture/common/BUILD.gn

@@ -35,6 +35,24 @@ mojom("mojo_types") {
     "//mojo/public/mojom/base",
     "//ui/gfx/geometry/mojom",
   ]
+
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "content_capture.mojom.ContentCaptureData"
+          cpp = "::content_capture::ContentCaptureData"
+        },
+      ]
+      traits_headers = [ "content_capture_mojom_traits.h" ]
+      traits_sources = [ "content_capture_mojom_traits.cc" ]
+      traits_public_deps = [
+        ":common",
+        "//base",
+        "//ui/gfx/geometry/mojom:mojom_traits",
+      ]
+    },
+  ]
 }
 
 mojom("mojo_test_types") {

components/content_capture/common/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

components/content_capture/common/content_capture.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 = "//components/content_capture/common/content_capture_data.mojom"
-public_headers =
-    [ "//components/content_capture/common/content_capture_data.h" ]
-traits_headers =
-    [ "//components/content_capture/common/content_capture_mojom_traits.h" ]
-sources = [
-  "//components/content_capture/common/content_capture_mojom_traits.cc",
-  "//components/content_capture/common/content_capture_mojom_traits.h",
-]
-deps = [
-  "//base",
-  "//components/content_capture/common:common",
-  "//ui/gfx/geometry/mojom:mojom_traits",
-]
-
-type_mappings = [ "content_capture.mojom.ContentCaptureData=::content_capture::ContentCaptureData" ]

components/content_capture/common/content_capture_mojom_traits.h

@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "components/content_capture/common/content_capture_data.h"
-#include "components/content_capture/common/content_capture_data.mojom.h"
+#include "components/content_capture/common/content_capture_data.mojom-shared.h"
 #include "mojo/public/cpp/bindings/struct_traits.h"
 #include "ui/gfx/geometry/rect_f.h"
 

components/content_settings/core/common/BUILD.gn

@@ -65,6 +65,41 @@ mojom("mojo_bindings") {
   sources = [ "content_settings.mojom" ]
 
   public_deps = [ "//mojo/public/mojom/base" ]
+
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "content_settings.mojom.PatternParts"
+          cpp = "::ContentSettingsPattern::PatternParts"
+        },
+        {
+          mojom = "content_settings.mojom.ContentSettingsPattern"
+          cpp = "::ContentSettingsPattern"
+        },
+        {
+          mojom = "content_settings.mojom.ContentSettingsType"
+          cpp = "::ContentSettingsType"
+        },
+        {
+          mojom = "content_settings.mojom.ContentSetting"
+          cpp = "::ContentSetting"
+        },
+        {
+          mojom = "content_settings.mojom.ContentSettingPatternSource"
+          cpp = "::ContentSettingPatternSource"
+        },
+        {
+          mojom = "content_settings.mojom.RendererContentSettingRules"
+          cpp = "::RendererContentSettingRules"
+        },
+      ]
+      traits_headers = [ "content_settings_mojom_traits.h" ]
+      traits_private_headers = [ "content_settings_param_traits.h" ]
+      traits_sources = [ "content_settings_mojom_traits.cc" ]
+      traits_public_deps = [ ":common" ]
+    },
+  ]
 }
 
 component("features") {

components/content_settings/core/common/OWNERS

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

components/content_settings/core/common/content_settings.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.
-
-deps = [
-  "//components/content_settings/core/common",
-  "//mojo/public/cpp/bindings",
-]
-mojom = "//components/content_settings/core/common/content_settings.mojom"
-public_deps = [
-  "//components/content_settings/core/common",
-]
-public_headers = [
-  "//components/content_settings/core/common/content_settings.h",
-  "//components/content_settings/core/common/content_settings_pattern.h",
-  "//components/content_settings/core/common/content_settings_types.h",
-]
-sources = [
-  "//components/content_settings/core/common/content_settings_mojom_traits.cc",
-]
-traits_headers = [
-  "//components/content_settings/core/common/content_settings_mojom_traits.h",
-  "//components/content_settings/core/common/content_settings_param_traits.h",
-]
-type_mappings = [
-  "content_settings.mojom.PatternParts=::ContentSettingsPattern::PatternParts",
-  "content_settings.mojom.ContentSettingsPattern=::ContentSettingsPattern",
-  "content_settings.mojom.ContentSettingsType=::ContentSettingsType",
-  "content_settings.mojom.ContentSetting=::ContentSetting",
-  "content_settings.mojom.ContentSettingPatternSource=::ContentSettingPatternSource",
-  "content_settings.mojom.RendererContentSettingRules=::RendererContentSettingRules",
-]

components/content_settings/core/common/content_settings_mojom_traits.h

@@ -9,7 +9,8 @@
 
 #include "base/values.h"
 #include "components/content_settings/core/common/content_settings.h"
-#include "components/content_settings/core/common/content_settings.mojom.h"
+#include "components/content_settings/core/common/content_settings.mojom-shared.h"
+#include "mojo/public/cpp/base/time_mojom_traits.h"
 #include "mojo/public/cpp/base/values_mojom_traits.h"
 #include "mojo/public/cpp/bindings/enum_traits.h"
 #include "mojo/public/cpp/bindings/struct_traits.h"

components/nacl/common/BUILD.gn

@@ -107,6 +107,25 @@ if (enable_nacl) {
 
   mojom("mojo_bindings") {
     sources = [ "nacl.mojom" ]
+    cpp_typemaps = [
+      {
+        types = [
+          {
+            mojom = "nacl.mojom.NaClErrorCode"
+            cpp = "::NaClErrorCode"
+          },
+        ]
+        traits_headers =
+            [ "//native_client/src/trusted/service_runtime/nacl_error_code.h" ]
+        traits_private_headers =
+            [ "//components/nacl/common/nacl_types_param_traits.h" ]
+        traits_public_deps = [
+          ":minimal",
+          ":nacl_error_code",
+        ]
+        traits_deps = [ "//ipc" ]
+      },
+    ]
   }
 }
 

components/nacl/common/nacl.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 = "//components/nacl/common/nacl.mojom"
-public_headers =
-    [ "//native_client/src/trusted/service_runtime/nacl_error_code.h" ]
-traits_headers = [ "//components/nacl/common/nacl_types_param_traits.h" ]
-deps = [
-  "//components/nacl/common:minimal",
-  "//components/nacl/common:nacl_error_code",
-  "//ipc",
-]
-
-type_mappings = [ "nacl.mojom.NaClErrorCode=::NaClErrorCode" ]

components/password_manager/content/common/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

components/password_manager/content/common/credential_manager.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/credentialmanager/credential_manager.mojom"
-public_headers =
-    [ "//components/password_manager/core/common/credential_manager_types.h" ]
-traits_headers = [ "//components/password_manager/content/common/credential_manager_mojom_traits.h" ]
-sources = [
-  "//components/password_manager/content/common/credential_manager_mojom_traits.cc",
-]
-deps = [
-  "//base",
-  "//components/password_manager/core/common",
-]
-
-type_mappings = [
-  "blink.mojom.CredentialType=::password_manager::CredentialType",
-  "blink.mojom.CredentialMediationRequirement=::password_manager::CredentialMediationRequirement",
-  "blink.mojom.CredentialInfo=::password_manager::CredentialInfo",
-  "blink.mojom.CredentialManagerError=::password_manager::CredentialManagerError",
-]

components/spellcheck/common/BUILD.gn

@@ -54,4 +54,22 @@ mojom("interfaces") {
   if (use_renderer_spellchecker) {
     enabled_features += [ "USE_RENDERER_SPELLCHECKER" ]
   }
+
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "spellcheck.mojom.Decoration"
+          cpp = "::SpellCheckResult::Decoration"
+        },
+        {
+          mojom = "spellcheck.mojom.SpellCheckResult"
+          cpp = "::SpellCheckResult"
+        },
+      ]
+      traits_headers = [ "spellcheck_mojom_traits.h" ]
+      traits_sources = [ "spellcheck_mojom_traits.cc" ]
+      traits_public_deps = [ "//components/spellcheck:buildflags" ]
+    },
+  ]
 }

components/spellcheck/common/OWNERS

-per-file *_messages*.h=set noparent
-per-file *_messages*.h=file://ipc/SECURITY_OWNERS
 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

components/spellcheck/common/spellcheck.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 = "//components/spellcheck/common/spellcheck.mojom"
-
-public_headers = [ "//components/spellcheck/common/spellcheck_result.h" ]
-
-traits_headers = [ "//components/spellcheck/common/spellcheck_mojom_traits.h" ]
-
-deps = [
-  "//components/spellcheck:buildflags",
-]
-
-public_deps = [
-  ":spellcheck_result",
-]
-
-sources = [
-  "spellcheck_mojom_traits.cc",
-  "spellcheck_mojom_traits.h",
-]
-
-type_mappings = [
-  "spellcheck.mojom.Decoration=::SpellCheckResult::Decoration",
-  "spellcheck.mojom.SpellCheckResult=::SpellCheckResult",
-]

components/spellcheck/common/spellcheck_mojom_traits.h

@@ -5,7 +5,7 @@
 #ifndef COMPONENTS_SPELLCHECK_COMMON_SPELLCHECK_MOJOM_TRAITS_H_
 #define COMPONENTS_SPELLCHECK_COMMON_SPELLCHECK_MOJOM_TRAITS_H_
 
-#include "components/spellcheck/common/spellcheck.mojom.h"
+#include "components/spellcheck/common/spellcheck.mojom-shared.h"
 #include "components/spellcheck/common/spellcheck_result.h"
 
 namespace mojo {

components/translate/content/common/BUILD.gn

@@ -11,4 +11,21 @@ mojom("common") {
     "//mojo/public/mojom/base",
     "//url/mojom:url_mojom_gurl",
   ]
+
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "translate.mojom.LanguageDetectionDetails"
+          cpp = "::translate::LanguageDetectionDetails"
+        },
+        {
+          mojom = "translate.mojom.TranslateError"
+          cpp = "::translate::TranslateErrors::Type"
+        },
+      ]
+      traits_headers = [ "translate_mojom_traits.h" ]
+      traits_sources = [ "translate_mojom_traits.cc" ]
+    },
+  ]
 }

components/translate/content/common/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

components/translate/content/common/translate.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 = "//components/translate/content/common/translate.mojom"
-public_headers = [
-  "//components/translate/core/common/language_detection_details.h",
-  "//components/translate/core/common/translate_errors.h",
-]
-traits_headers =
-    [ "//components/translate/content/common/translate_mojom_traits.h" ]
-sources = [
-  "//components/translate/content/common/translate_mojom_traits.cc",
-]
-deps = [
-  "//base",
-  "//components/translate/core/common",
-]
-
-type_mappings = [
-  "translate.mojom.LanguageDetectionDetails=::translate::LanguageDetectionDetails",
-  "translate.mojom.TranslateError=::translate::TranslateErrors::Type",
-]

components/translate/content/common/translate_mojom_traits.h

@@ -7,7 +7,7 @@
 
 #include "base/strings/string16.h"
 #include "base/time/time.h"
-#include "components/translate/content/common/translate.mojom.h"
+#include "components/translate/content/common/translate.mojom-shared.h"
 #include "components/translate/core/common/language_detection_details.h"
 #include "components/translate/core/common/translate_errors.h"
 #include "mojo/public/cpp/bindings/struct_traits.h"

components/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 = [
-  "//components/account_id/mojom/account_id.typemap",
-  "//components/autofill/core/common/mojom/autofill_types.typemap",
-  "//components/content_capture/common/content_capture.typemap",
-  "//components/content_settings/core/common/content_settings.typemap",
-  "//components/nacl/common/nacl.typemap",
-  "//components/password_manager/content/common/credential_manager.typemap",
-  "//components/spellcheck/common/spellcheck.typemap",
-  "//components/translate/content/common/translate.typemap",
-]

mojo/public/tools/bindings/chromium_bindings_configuration.gni

@@ -18,7 +18,6 @@ _typemap_imports = [
   "//components/media_router/common/mojom/typemaps.gni",
   "//components/services/storage/public/cpp/filesystem/typemaps.gni",
   "//components/sync/mojom/typemaps.gni",
-  "//components/typemaps.gni",
   "//content/browser/typemaps.gni",
   "//content/public/common/typemaps.gni",
 ]

third_party/blink/public/mojom/BUILD.gn

@@ -404,6 +404,32 @@ mojom("mojom_platform") {
       traits_headers = [ "//ui/base/mojom/clipboard_blink_mojom_traits.h" ]
       traits_public_deps = [ "//ui/base/clipboard:clipboard_types" ]
     },
+    {
+      types = [
+        {
+          mojom = "blink.mojom.CredentialType"
+          cpp = "::password_manager::CredentialType"
+        },
+        {
+          mojom = "blink.mojom.CredentialMediationRequirement"
+          cpp = "::password_manager::CredentialMediationRequirement"
+        },
+        {
+          mojom = "blink.mojom.CredentialInfo"
+          cpp = "::password_manager::CredentialInfo"
+        },
+        {
+          mojom = "blink.mojom.CredentialManagerError"
+          cpp = "::password_manager::CredentialManagerError"
+        },
+      ]
+      traits_headers = [ "//components/password_manager/content/common/credential_manager_mojom_traits.h" ]
+      traits_sources = [ "//components/password_manager/content/common/credential_manager_mojom_traits.cc" ]
+      traits_public_deps = [
+        "//base",
+        "//components/password_manager/core/common",
+      ]
+    },
     {
       types = [
         {