Use new wrapper types for web_bluetooth.mojom

third_party/WebKit/public/BUILD.gn

Index: third_party/WebKit/public/BUILD.gn
diff --git a/third_party/WebKit/public/BUILD.gn b/third_party/WebKit/public/BUILD.gn
index ab794f1f811b7fa5d344e6e771cb49333b556f75..f928f765b51fb43343e13c9c32dbd355513a70ef 100644
--- a/third_party/WebKit/public/BUILD.gn
+++ b/third_party/WebKit/public/BUILD.gn
@@ -648,7 +648,6 @@ mojom("mojo_bindings") {
   sources = [
     "platform/mime_registry.mojom",
     "platform/modules/background_sync/background_sync.mojom",
-    "platform/modules/bluetooth/web_bluetooth.mojom",
     "platform/modules/broadcastchannel/broadcast_channel.mojom",
     "platform/modules/budget_service/budget_service.mojom",
     "platform/modules/hyphenation/hyphenation.mojom",
@@ -660,7 +659,6 @@ mojom("mojo_bindings") {
   public_deps = [
     ":android_mojo_bindings",
     ":new_wrapper_types_mojo_bindings",
-    "//device/bluetooth/public/interfaces",
     "//mojo/common:common_custom_types",
     "//url/mojo:url_mojom_origin",
   ]
@@ -684,6 +682,7 @@ mojom("mojo_bindings") {
 mojom("new_wrapper_types_mojo_bindings") {
   sources = [
     "platform/modules/app_banner/app_banner.mojom",
+    "platform/modules/bluetooth/web_bluetooth.mojom",
     "platform/modules/mediasession/media_session.mojom",
     "platform/modules/permissions/permission.mojom",
     "platform/modules/permissions/permission_status.mojom",
@@ -694,6 +693,8 @@ mojom("new_wrapper_types_mojo_bindings") {
     "web/window_features.mojom",
   ]
   public_deps = [
+    ":android_mojo_bindings",
+    "//device/bluetooth/public/interfaces",
     "//mojo/common:common_custom_types",
     "//ui/gfx/geometry/mojo",
     "//ui/gfx/geometry/mojo:mojo",
@@ -701,10 +702,15 @@ mojom("new_wrapper_types_mojo_bindings") {
     "//url/mojo:url_mojom_origin",
   ]
 
-  # See comment above.
+  # The chromium variant must be linked with content and use the same export
+  # settings in component build because of the WebBluetoothDeviceId typemap
+  # inside content.
   export_class_attribute = "CONTENT_EXPORT"
   export_define = "CONTENT_IMPLEMENTATION=1"
   export_header = "content/common/content_export.h"
+
+  # Similarly, the blink variant must be linked with the platform component
+  # since it uses types from it in its typemaps.
   export_class_attribute_blink = "BLINK_PLATFORM_EXPORT"
   export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
   export_header_blink = "third_party/WebKit/public/platform/WebCommon.h"
@@ -766,6 +772,6 @@ source_set("shared_typemap_traits") {
     "web/WindowFeaturesStructTraits.cpp",
   ]
   deps = [
-    ":new_wrapper_types_mojo_bindings_shared__generator",
+    ":mojo_bindings_shared__generator",
   ]
 }