Use new wrapper types for web_bluetooth.mojom

third_party/WebKit/public/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/buildflag_header.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//third_party/WebKit/public/public_features.gni")
 import("//third_party/WebKit/Source/config.gni")
 import("//third_party/WebKit/Source/core/core.gni")
 import("//tools/grit/grit_rule.gni")
@@ skipping 623 matching lines @@
   source = "blink_image_resources.grd"
   outputs = [
     "grit/blink_image_resources.h",
     "blink_image_resources_100_percent.pak",
     "blink_image_resources_200_percent.pak",
   ]
 }
 
 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",
     "platform/modules/mediasession/media_session.mojom",
     "platform/modules/notifications/notification.mojom",
     "platform/modules/notifications/notification_service.mojom",
     "platform/modules/permissions/permission.mojom",
     "platform/modules/permissions/permission_status.mojom",
     "platform/modules/presentation/presentation.mojom",
     "platform/modules/screen_orientation/screen_orientation_lock_types.mojom",
     "platform/modules/sensitive_input_visibility/sensitive_input_visibility_service.mojom",
     "platform/modules/serviceworker/service_worker_event_status.mojom",
     "platform/modules/shapedetection/shapedetection.mojom",
     "platform/modules/websockets/websocket.mojom",
     "platform/referrer.mojom",
     "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",
     "//url/mojo:url_mojom_gurl",
     "//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"
 }
 
 mojom("android_mojo_bindings") {
   sources = [
     "platform/modules/webshare/webshare.mojom",
   ]
   public_deps = [
@@ skipping 40 matching lines @@
 
 # Some mojom typemaps are shared between Chromium and Blink variants and
 # therefore require some shared traits implementation. These definitions are
 # relegated to a separate target to avoid duplication between the variants.
 source_set("shared_typemap_traits") {
   visibility = [ ":*" ]
   sources = [
     "web/WindowFeaturesStructTraits.cpp",
   ]
   deps = [
-    ":new_wrapper_types_mojo_bindings_shared__generator",
+    ":mojo_bindings_shared__generator",
   ]
 }