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 f3a05ca855bde3a8d726dd6c3fa8d8853533a850..1bb4ca0ac4c9799497086d4c330401e456374e56 100644
--- a/third_party/WebKit/public/BUILD.gn
+++ b/third_party/WebKit/public/BUILD.gn
@@ -641,37 +641,10 @@ grit("image_resources") {
 
 mojom("mojo_bindings") {
   sources = [
-    "platform/modules/bluetooth/web_bluetooth.mojom",
-  ]
-  public_deps = [
-    ":android_mojo_bindings",
-    ":new_wrapper_types_mojo_bindings",
-    "//device/bluetooth/public/interfaces",
-    "//mojo/common:common_custom_types",
-    "//url/mojo:url_mojom_origin",
-  ]
-
-  use_new_wrapper_types = false
-
-  # 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"
-}
-
-mojom("new_wrapper_types_mojo_bindings") {
-  sources = [
     "platform/mime_registry.mojom",
     "platform/modules/app_banner/app_banner.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",
@@ -690,6 +663,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",
@@ -697,10 +672,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"
@@ -761,6 +741,6 @@ source_set("shared_typemap_traits") {
     "web/WindowFeaturesStructTraits.cpp",
   ]
   deps = [
-    ":new_wrapper_types_mojo_bindings_shared__generator",
+    ":mojo_bindings_shared__generator",
   ]
 }