Extend disable_bluetooth flag to content, device, and services (#8937)

The previous PR that introduced the disable_bluetooth flag only excluded
the interface under third_party/blink.

This change extends the exclusion to Bluetooth-related codes under
content, device, and services when 'disable_bluetooth' is true.

Additionally, Serial (which depends on Bluetooth) is excluded from
lightweight builds as well.

Author: Youngsoo

BUILD.gn

@@ -14,6 +14,7 @@ import("//build/config/compiler/compiler.gni")
 import("//build/config/cronet/config.gni")
 import("//build/config/dcheck_always_on.gni")
 import("//build/config/features.gni")
+import("//build/config/lightweight.gni")
 import("//build/config/rust.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/ui.gni")
@@ -873,6 +874,10 @@ group("gn_all") {
     if (!is_android && !is_ios) {
       deps += [ "//components/cronet:cronet_tests" ]
     }
+
+    if (disable_bluetooth && !is_android && !is_ios) {
+      deps -= [ "//content/browser/bluetooth/tools:bluetooth_metrics_hash" ]
+    }
   }
 
   if (is_chrome_for_testing) {
@@ -1350,6 +1355,12 @@ if (use_blink && !is_cronet_build) {
         "//build/android/",
       ]
     }
+
+    if (disable_bluetooth) {
+      data_deps -= [
+        "//device/bluetooth/public/mojom:fake_bluetooth_interfaces_js_data_deps",
+      ]
+    }
   }
 
   _common_web_test_script = "//testing/scripts/run_isolated_script_test.py"

build/BUILD.gn

@@ -129,6 +129,7 @@ buildflag_header("lightweight_buildflags") {
   header = "lightweight_buildflags.h"
   flags = [
     "DISABLE_XR=$disable_xr",
+    "DISABLE_BLUETOOTH=$disable_bluetooth",
   ]
 }
 

components/BUILD.gn

@@ -5,6 +5,7 @@
 import("//base/debug/debug.gni")
 import("//build/config/chrome_build.gni")
 import("//build/config/features.gni")
+import("//build/config/lightweight.gni")
 import("//build/config/ui.gni")
 import("//components/compose/features.gni")
 import("//components/enterprise/buildflags/buildflags.gni")
@@ -1229,6 +1230,9 @@ if (use_blink) {
         "//sandbox",
       ]
     }
+
+    # TODO(lightweight): "device/bluetooth" can be removed. Upstream to Chromium.
+    deps -= [ "//device/bluetooth" ]
   }
 
   test("components_perftests") {

components/permissions/BUILD.gn

@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/lightweight.gni")
 import("//components/guest_view/buildflags/buildflags.gni")
 import("//device/vr/buildflags/buildflags.gni")
 import("//services/device/public/cpp/geolocation/buildflags.gni")
@@ -235,6 +236,33 @@ source_set("permissions") {
   public_deps = [ ":permissions_common" ]
 
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
+
+  if (disable_bluetooth) {
+    sources -= [
+      "bluetooth_delegate_impl.cc",
+      "bluetooth_delegate_impl.h",
+      "contexts/bluetooth_chooser_context.cc",
+      "contexts/bluetooth_chooser_context.h",
+    ]
+
+    if (!is_android) {
+      sources -= [
+        "bluetooth_chooser_controller.cc",
+        "bluetooth_chooser_controller.h",
+        "bluetooth_chooser_desktop.cc",
+        "bluetooth_chooser_desktop.h",
+        "bluetooth_scanning_prompt_controller.cc",
+        "bluetooth_scanning_prompt_controller.h",
+        "bluetooth_scanning_prompt_desktop.cc",
+        "bluetooth_scanning_prompt_desktop.h",
+      ]
+    }
+
+    deps -= [
+      "//device/bluetooth",
+      "//device/bluetooth/public/cpp",
+    ]
+  }
 }
 
 source_set("test_support") {

content/app/BUILD.gn

@@ -5,6 +5,7 @@
 import("//build/config/apple/mobile_config.gni")
 import("//build/config/chrome_build.gni")
 import("//build/config/features.gni")
+import("//build/config/lightweight.gni")
 import("//ppapi/buildflags/buildflags.gni")
 import("//third_party/tflite/features.gni")
 
@@ -51,6 +52,12 @@ if (is_win) {
     "//ui/events",
     "//ui/shell_dialogs",
   ]
+
+  if (disable_bluetooth) {
+    content_app_deps -= [
+      "//device/bluetooth",
+    ]
+  }
 }
 
 if (is_ios && target_platform != "tvos") {

content/browser/BUILD.gn

@@ -6,6 +6,7 @@ import("//base/allocator/partition_allocator/partition_alloc.gni")
 import("//build/buildflag_header.gni")
 import("//build/config/compiler/pgo/pgo.gni")
 import("//build/config/features.gni")
+import("//build/config/lightweight.gni")
 import("//build/config/linux/pangocairo/pangocairo.gni")
 import("//build/config/ozone.gni")
 import("//build/config/ui.gni")
@@ -3709,6 +3710,51 @@ source_set("browser") {
   if (is_chromeos) {
     deps += [ "//ash/constants:constants" ]
   }
+
+  if (disable_bluetooth) {
+    sources -= [
+      "bluetooth/advertisement_client.cc",
+      "bluetooth/advertisement_client.h",
+      "bluetooth/bluetooth_adapter_factory_wrapper.cc",
+      "bluetooth/bluetooth_adapter_factory_wrapper.h",
+      "bluetooth/bluetooth_allowed_devices.cc",
+      "bluetooth/bluetooth_allowed_devices.h",
+      "bluetooth/bluetooth_allowed_devices_map.cc",
+      "bluetooth/bluetooth_allowed_devices_map.h",
+      "bluetooth/bluetooth_blocklist.cc",
+      "bluetooth/bluetooth_blocklist.h",
+      "bluetooth/bluetooth_device_chooser_controller.cc",
+      "bluetooth/bluetooth_device_chooser_controller.h",
+      "bluetooth/bluetooth_device_scanning_prompt_controller.cc",
+      "bluetooth/bluetooth_device_scanning_prompt_controller.h",
+      "bluetooth/bluetooth_metrics.cc",
+      "bluetooth/bluetooth_metrics.h",
+      "bluetooth/bluetooth_util.cc",
+      "bluetooth/bluetooth_util.h",
+      "bluetooth/frame_connected_bluetooth_devices.cc",
+      "bluetooth/frame_connected_bluetooth_devices.h",
+      "bluetooth/web_bluetooth_pairing_manager.h",
+      "bluetooth/web_bluetooth_pairing_manager_delegate.h",
+      "bluetooth/web_bluetooth_pairing_manager_impl.cc",
+      "bluetooth/web_bluetooth_pairing_manager_impl.h",
+      "bluetooth/web_bluetooth_service_impl.cc",
+      "bluetooth/web_bluetooth_service_impl.h",
+      "serial/serial_service.cc",
+      "serial/serial_service.h",
+    ]
+
+    deps -= [
+      "//device/bluetooth",
+      "//device/bluetooth/public/cpp",
+    ]
+    
+    if (!is_android) {
+      sources -= [
+        "webid/digital_credentials/cross_device_transaction_impl.cc",
+        "webid/digital_credentials/cross_device_transaction_impl.h",
+      ]
+    }
+  }
 }
 
 if (is_android) {

content/browser/browser_interface_binders.cc

@@ -15,6 +15,7 @@
 #include "base/task/thread_pool.h"
 #include "build/branding_buildflags.h"
 #include "build/build_config.h"
+#include "build/lightweight_buildflags.h"
 #include "cc/base/switches.h"
 #include "components/language_detection/content/common/language_detection.mojom.h"
 #include "components/optimization_guide/public/mojom/model_broker.mojom.h"
@@ -23,7 +24,9 @@
 #include "content/browser/attribution_reporting/attribution_internals_ui.h"
 #include "content/browser/background_fetch/background_fetch_service_impl.h"
 #include "content/browser/bad_message.h"
+#if !BUILDFLAG(DISABLE_BLUETOOTH)
 #include "content/browser/bluetooth/web_bluetooth_service_impl.h"
+#endif
 #include "content/browser/browser_context_impl.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/browsing_topics/browsing_topics_document_host.h"
@@ -137,7 +140,9 @@
 #include "third_party/blink/public/mojom/background_sync/background_sync.mojom.h"
 #include "third_party/blink/public/mojom/blob/blob_url_store.mojom.h"
 #include "third_party/blink/public/mojom/blob/file_backed_blob_factory.mojom.h"
+#if !BUILDFLAG(DISABLE_BLUETOOTH)
 #include "third_party/blink/public/mojom/bluetooth/web_bluetooth.mojom.h"
+#endif
 #include "third_party/blink/public/mojom/buckets/bucket_manager_host.mojom.h"
 #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h"
 #include "third_party/blink/public/mojom/choosers/color_chooser.mojom.h"
@@ -181,7 +186,10 @@
 #include "third_party/blink/public/mojom/push_messaging/push_messaging.mojom.h"
 #include "third_party/blink/public/mojom/quota/quota_manager_host.mojom.h"
 #include "third_party/blink/public/mojom/sensor/web_sensor_provider.mojom.h"
+// Serial depends on Bluetooth
+#if !BUILDFLAG(DISABLE_BLUETOOTH)
 #include "third_party/blink/public/mojom/serial/serial.mojom.h"
+#endif
 #include "third_party/blink/public/mojom/sms/webotp_service.mojom.h"
 #include "third_party/blink/public/mojom/speculation_rules/speculation_rules.mojom.h"
 #include "third_party/blink/public/mojom/speech/speech_synthesis.mojom.h"
@@ -941,8 +949,10 @@ void PopulateFrameBinders(RenderFrameHostImpl* host, mojo::BinderMap* map) {
         &BindWebNNContextProviderForRenderFrame, base::Unretained(host)));
   }
 
+#if !BUILDFLAG(DISABLE_BLUETOOTH)
   map->Add<blink::mojom::WebBluetoothService>(base::BindRepeating(
       &WebBluetoothServiceImpl::BindIfAllowed, base::Unretained(host)));
+#endif
 
   map->Add<blink::mojom::PushMessaging>(base::BindRepeating(
       &RenderFrameHostImpl::GetPushMessaging, base::Unretained(host)));
@@ -1099,8 +1109,11 @@ void PopulateFrameBinders(RenderFrameHostImpl* host, mojo::BinderMap* map) {
                           base::Unretained(host)));
 #endif  // BUILDFLAG(IS_ANDROID)
 
+// Serial depends on Bluetooth
+#if !BUILDFLAG(DISABLE_BLUETOOTH)
   map->Add<blink::mojom::SerialService>(base::BindRepeating(
       &RenderFrameHostImpl::BindSerialService, base::Unretained(host)));
+#endif
 
 #if BUILDFLAG(IS_CHROMEOS)
   map->Add<blink::mojom::SmartCardService>(base::BindRepeating(
@@ -1395,8 +1408,11 @@ void PopulateDedicatedWorkerBinders(DedicatedWorkerHost* host,
                           base::Unretained(host)));
   map->Add<blink::mojom::ReportingServiceProxy>(base::BindRepeating(
       &CreateReportingServiceProxyForDedicatedWorker, base::Unretained(host)));
+// Serial depends on Bluetooth
+#if !BUILDFLAG(DISABLE_BLUETOOTH)
   map->Add<blink::mojom::SerialService>(base::BindRepeating(
       &DedicatedWorkerHost::BindSerialService, base::Unretained(host)));
+#endif
 #if !BUILDFLAG(IS_ANDROID)
   map->Add<blink::mojom::HidService>(base::BindRepeating(
       &DedicatedWorkerHost::BindHidService, base::Unretained(host)));

content/browser/renderer_host/render_frame_host_impl.cc

@@ -58,6 +58,7 @@
 #include "base/types/optional_util.h"
 #include "base/uuid.h"
 #include "build/build_config.h"
+#include "build/lightweight_buildflags.h"
 #include "components/download/public/common/download_url_parameters.h"
 #include "components/input/input_router.h"
 #include "components/input/timeout_monitor.h"
@@ -67,7 +68,8 @@
 #include "content/browser/accessibility/render_accessibility_host.h"
 #include "content/browser/bad_message.h"
 #include "content/browser/blob_storage/file_backed_blob_factory_frame_impl.h"
-#include "content/browser/bluetooth/web_bluetooth_service_impl.h"
+// TODO(lightweight): Upstream to Chromium.
+//#include "content/browser/bluetooth/web_bluetooth_service_impl.h"
 #include "content/browser/broadcast_channel/broadcast_channel_provider.h"
 #include "content/browser/broadcast_channel/broadcast_channel_service.h"
 #include "content/browser/browser_main_loop.h"
@@ -152,7 +154,10 @@
 #include "content/browser/renderer_host/view_transition_opt_in_state.h"
 #include "content/browser/scoped_active_url.h"
 #include "content/browser/security/coop/cross_origin_opener_policy_reporter.h"
+// Disable serial when bluetooth is disabled.
+#if !BUILDFLAG(DISABLE_BLUETOOTH)
 #include "content/browser/serial/serial_service.h"
+#endif
 #include "content/browser/service_worker/service_worker_client.h"
 #include "content/browser/site_info.h"
 #include "content/browser/sms/webotp_service.h"
@@ -14073,6 +14078,8 @@ void RenderFrameHostImpl::BindNFCReceiver(
 }
 #endif
 
+// Serial depends on Bluetooth
+#if !BUILDFLAG(DISABLE_BLUETOOTH)
 void RenderFrameHostImpl::BindSerialService(
     mojo::PendingReceiver<blink::mojom::SerialService> receiver) {
   if (!IsFeatureEnabled(network::mojom::PermissionsPolicyFeature::kSerial)) {
@@ -14100,6 +14107,7 @@ void RenderFrameHostImpl::BindSerialService(
 
   SerialService::GetOrCreateForCurrentDocument(this)->Bind(std::move(receiver));
 }
+#endif
 
 #if !BUILDFLAG(IS_ANDROID)
 void RenderFrameHostImpl::GetHidService(

content/browser/renderer_host/render_frame_host_impl.h

@@ -44,6 +44,7 @@
 #include "base/unguessable_token.h"
 #include "base/uuid.h"
 #include "build/build_config.h"
+#include "build/lightweight_buildflags.h"
 #include "content/browser/bad_message.h"
 #include "content/browser/browser_interface_broker_impl.h"
 #include "content/browser/buckets/bucket_context.h"
@@ -174,7 +175,10 @@
 #include "third_party/blink/public/mojom/render_accessibility.mojom.h"
 #include "third_party/blink/public/mojom/security_context/insecure_request_policy.mojom-forward.h"
 #include "third_party/blink/public/mojom/sensor/web_sensor_provider.mojom-forward.h"
+// Serial depends on Bluetooth
+#if !BUILDFLAG(DISABLE_BLUETOOTH)
 #include "third_party/blink/public/mojom/serial/serial.mojom-forward.h"
+#endif
 #include "third_party/blink/public/mojom/sms/webotp_service.mojom-forward.h"
 #include "third_party/blink/public/mojom/speech/speech_synthesis.mojom-forward.h"
 #include "third_party/blink/public/mojom/webaudio/audio_context_manager.mojom-forward.h"
@@ -2089,8 +2093,11 @@ class CONTENT_EXPORT RenderFrameHostImpl
   void GetHidService(mojo::PendingReceiver<blink::mojom::HidService> receiver);
 #endif
 
+// Serial depends on Bluetooth
+#if !BUILDFLAG(DISABLE_BLUETOOTH)
   void BindSerialService(
       mojo::PendingReceiver<blink::mojom::SerialService> receiver);
+#endif
 
 #if BUILDFLAG(IS_CHROMEOS)
   void GetSmartCardService(

content/browser/storage_partition_impl.cc

@@ -38,6 +38,7 @@
 #include "base/threading/sequence_local_storage_slot.h"
 #include "base/types/optional_util.h"
 #include "build/build_config.h"
+#include "build/lightweight_buildflags.h"
 #include "components/attribution_reporting/features.h"
 #include "components/leveldb_proto/public/proto_database_provider.h"
 #include "components/services/storage/privileged/cpp/bucket_client_info.h"
@@ -56,7 +57,9 @@
 #include "content/browser/background_fetch/background_fetch_context.h"
 #include "content/browser/blob_storage/blob_registry_wrapper.h"
 #include "content/browser/blob_storage/chrome_blob_storage_context.h"
+#if !BUILDFLAG(DISABLE_BLUETOOTH)
 #include "content/browser/bluetooth/bluetooth_allowed_devices_map.h"
+#endif
 #include "content/browser/broadcast_channel/broadcast_channel_service.h"
 #include "content/browser/browsing_data/clear_site_data_handler.h"
 #include "content/browser/browsing_data/storage_partition_code_cache_data_remover.h"
@@ -1418,8 +1421,10 @@ void StoragePartitionImpl::Initialize(
 
   broadcast_channel_service_ = std::make_unique<BroadcastChannelService>();
 
+#if !BUILDFLAG(DISABLE_BLUETOOTH)
   bluetooth_allowed_devices_map_ =
       std::make_unique<BluetoothAllowedDevicesMap>();
+#endif
 
   // Must be initialized before the
   // `shared_url_loader_factory_for_browser_process_`. Cookie deprecation
@@ -1774,11 +1779,13 @@ BroadcastChannelService* StoragePartitionImpl::GetBroadcastChannelService() {
   return broadcast_channel_service_.get();
 }
 
+#if !BUILDFLAG(DISABLE_BLUETOOTH)
 BluetoothAllowedDevicesMap*
 StoragePartitionImpl::GetBluetoothAllowedDevicesMap() {
   DCHECK(initialized_);
   return bluetooth_allowed_devices_map_.get();
 }
+#endif
 
 BlobRegistryWrapper* StoragePartitionImpl::GetBlobRegistry() {
   DCHECK(initialized_);
@@ -3339,8 +3346,10 @@ void StoragePartitionImpl::ResetURLLoaderFactories() {
 }
 
 void StoragePartitionImpl::ClearBluetoothAllowedDevicesMapForTesting() {
+#if !BUILDFLAG(DISABLE_BLUETOOTH)
   DCHECK(initialized_);
   bluetooth_allowed_devices_map_->Clear();
+#endif
 }
 
 void StoragePartitionImpl::AddObserver(DataRemovalObserver* observer) {