Move chromeos/{ => ash}/services/bluetooth_config/

This CL is part of the Chrome OS source code directory migration:
https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE.

Bug: 1164001
Change-Id: I1376830830f9bd45abfec194edaa4b60139d4ca8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3762637
Owners-Override: Hidehiko Abe <hidehiko@chromium.org>
Commit-Queue: Henrique Ferreiro <hferreiro@igalia.com>
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1042156}

ash/BUILD.gn

@@ -2334,6 +2334,8 @@ component("ash") {
     "//chromeos/ash/components/network",
     "//chromeos/ash/services/assistant/public/cpp",
     "//chromeos/ash/services/assistant/public/mojom",
+    "//chromeos/ash/services/bluetooth_config/public/cpp",
+    "//chromeos/ash/services/bluetooth_config/public/mojom",
     "//chromeos/ash/services/libassistant/public/cpp:structs",
     "//chromeos/ash/services/libassistant/public/mojom",
     "//chromeos/components/quick_answers/public/cpp:prefs",
@@ -2348,8 +2350,6 @@ component("ash") {
     "//chromeos/dbus/power:power_manager_proto",
     "//chromeos/login/login_state",
     "//chromeos/metrics",
-    "//chromeos/services/bluetooth_config/public/cpp",
-    "//chromeos/services/bluetooth_config/public/mojom",
     "//chromeos/services/hotspot_config/public/mojom",
     "//chromeos/services/network_config/public/cpp",
     "//chromeos/services/network_config/public/mojom",
@@ -3151,14 +3151,14 @@ test("ash_unittests") {
     "//chromeos/ash/services/assistant:test_support",
     "//chromeos/ash/services/assistant/public/cpp",
     "//chromeos/ash/services/assistant/public/mojom",
+    "//chromeos/ash/services/bluetooth_config:test_support",
     "//chromeos/components/sensors:sensors",
     "//chromeos/components/sensors:test_support",
     "//chromeos/components/sensors/mojom",
     "//chromeos/constants",
     "//chromeos/crosapi/cpp",
     "//chromeos/dbus/power",
     "//chromeos/dbus/power:power_manager_proto",
-    "//chromeos/services/bluetooth_config:test_support",
     "//chromeos/services/network_config/public/cpp",
     "//chromeos/services/network_config/public/mojom",
     "//chromeos/strings:strings_grit",
@@ -3594,10 +3594,10 @@ static_library("test_support") {
     "//chromeos/ash/components/network:test_support",
     "//chromeos/ash/services/assistant:test_support",
     "//chromeos/ash/services/assistant/public/cpp",
+    "//chromeos/ash/services/bluetooth_config:test_support",
     "//chromeos/dbus/power",
     "//chromeos/dbus/power:power_manager_proto",
     "//chromeos/login/login_state",
-    "//chromeos/services/bluetooth_config:test_support",
     "//chromeos/system",
     "//chromeos/ui/frame",
     "//components/account_id",

ash/DEPS

@@ -87,8 +87,8 @@ include_rules = [
   # //ash can use the public interfaces of various services.
   "+chromeos/ash/services/assistant/public/cpp" ,
   "+chromeos/ash/services/assistant/test_support",
+  "+chromeos/ash/services/bluetooth_config",
   "+chromeos/ash/services/libassistant/public",
-  "+chromeos/services/bluetooth_config",
   "+chromeos/services/machine_learning/public",
   "+chromeos/services/network_config/public",
   "+chromeos/services/power/public",

ash/components/hid_detection/BUILD.gn

@@ -24,7 +24,7 @@ static_library("hid_detection") {
     "//ash/constants:constants",
     "//ash/public/cpp",
     "//base",
-    "//chromeos/services/bluetooth_config/public/mojom",
+    "//chromeos/ash/services/bluetooth_config/public/mojom",
     "//components/device_event_log",
     "//device/bluetooth",
     "//mojo/public/cpp/bindings",
@@ -63,9 +63,9 @@ source_set("unit_tests") {
     "//ash/constants",
     "//base",
     "//base/test:test_support",
-    "//chromeos/services/bluetooth_config",
-    "//chromeos/services/bluetooth_config:test_support",
-    "//chromeos/services/bluetooth_config/public/mojom",
+    "//chromeos/ash/services/bluetooth_config",
+    "//chromeos/ash/services/bluetooth_config:test_support",
+    "//chromeos/ash/services/bluetooth_config/public/mojom",
     "//device/bluetooth:mocks",
     "//mojo/public/cpp/bindings",
     "//services/device/public/cpp/hid:hid",

ash/components/hid_detection/DEPS

@@ -1,5 +1,4 @@
 include_rules = [
-  "+chromeos/services/bluetooth_config",
   "+components/device_event_log",
   "+services/device/public",
-]
+]

ash/components/hid_detection/bluetooth_hid_detector_impl.h

@@ -11,7 +11,7 @@
 #include "base/containers/queue.h"
 #include "base/memory/weak_ptr.h"
 #include "base/timer/elapsed_timer.h"
-#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h"
+#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
 

ash/components/hid_detection/bluetooth_hid_detector_impl_unittest.cc

@@ -10,14 +10,14 @@
 #include "base/test/metrics/histogram_tester.h"
 #include "base/test/scoped_feature_list.h"
 #include "base/test/task_environment.h"
-#include "chromeos/services/bluetooth_config/fake_adapter_state_controller.h"
-#include "chromeos/services/bluetooth_config/fake_bluetooth_power_controller.h"
-#include "chromeos/services/bluetooth_config/fake_device_cache.h"
-#include "chromeos/services/bluetooth_config/fake_device_pairing_handler.h"
-#include "chromeos/services/bluetooth_config/fake_discovered_devices_provider.h"
-#include "chromeos/services/bluetooth_config/fake_discovery_session_manager.h"
-#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h"
-#include "chromeos/services/bluetooth_config/scoped_bluetooth_config_test_helper.h"
+#include "chromeos/ash/services/bluetooth_config/fake_adapter_state_controller.h"
+#include "chromeos/ash/services/bluetooth_config/fake_bluetooth_power_controller.h"
+#include "chromeos/ash/services/bluetooth_config/fake_device_cache.h"
+#include "chromeos/ash/services/bluetooth_config/fake_device_pairing_handler.h"
+#include "chromeos/ash/services/bluetooth_config/fake_discovered_devices_provider.h"
+#include "chromeos/ash/services/bluetooth_config/fake_discovery_session_manager.h"
+#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h"
+#include "chromeos/ash/services/bluetooth_config/scoped_bluetooth_config_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ash::hid_detection {

ash/public/cpp/BUILD.gn

@@ -378,8 +378,8 @@ component("cpp") {
     "//chromeos/ash/components/audio",
     "//chromeos/ash/components/audio:in_process_audio_config",
     "//chromeos/ash/services/assistant/public/cpp",
+    "//chromeos/ash/services/bluetooth_config:in_process_bluetooth_config",
     "//chromeos/dbus/power:power_manager_proto",
-    "//chromeos/services/bluetooth_config:in_process_bluetooth_config",
     "//chromeos/services/network_config:in_process_instance",
     "//chromeos/strings:strings_grit",
     "//chromeos/ui/base",
@@ -421,9 +421,9 @@ component("cpp") {
     "//base",
     "//chromeos/ash/components/audio/public/mojom",
     "//chromeos/ash/services/assistant/public/mojom",
+    "//chromeos/ash/services/bluetooth_config/public/mojom",
     "//chromeos/components/security_token_pin",
     "//chromeos/crosapi/mojom",
-    "//chromeos/services/bluetooth_config/public/mojom",
     "//chromeos/services/network_config/public/mojom",
     "//components/app_restore",
     "//components/session_manager:base",

ash/public/cpp/bluetooth_config_service.cc

@@ -4,7 +4,7 @@
 
 #include "ash/public/cpp/bluetooth_config_service.h"
 
-#include "chromeos/services/bluetooth_config/in_process_instance.h"
+#include "chromeos/ash/services/bluetooth_config/in_process_instance.h"
 
 namespace ash {
 

ash/public/cpp/bluetooth_config_service.h

@@ -6,7 +6,7 @@
 #define ASH_PUBLIC_CPP_BLUETOOTH_CONFIG_SERVICE_H_
 
 #include "ash/public/cpp/ash_public_export.h"
-#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h"
+#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 
 namespace ash {

ash/quick_pair/keyed_service/BUILD.gn

@@ -33,9 +33,9 @@ static_library("keyed_service") {
     "//ash/quick_pair/ui",
     "//ash/services/quick_pair",
     "//base",
-    "//chromeos/services/bluetooth_config",
-    "//chromeos/services/bluetooth_config/public/cpp",
-    "//chromeos/services/bluetooth_config/public/mojom",
+    "//chromeos/ash/services/bluetooth_config",
+    "//chromeos/ash/services/bluetooth_config/public/cpp",
+    "//chromeos/ash/services/bluetooth_config/public/mojom",
     "//components/keyed_service/core",
     "//components/prefs",
     "//components/user_manager",
@@ -72,9 +72,9 @@ source_set("unit_tests") {
     "//ash/services/quick_pair:test_support",
     "//base",
     "//base/test:test_support",
-    "//chromeos/services/bluetooth_config",
-    "//chromeos/services/bluetooth_config:test_support",
-    "//chromeos/services/bluetooth_config/public/mojom",
+    "//chromeos/ash/services/bluetooth_config",
+    "//chromeos/ash/services/bluetooth_config:test_support",
+    "//chromeos/ash/services/bluetooth_config/public/mojom",
     "//components/prefs:test_support",
     "//components/user_manager:test_support",
     "//device/bluetooth",

ash/quick_pair/keyed_service/fast_pair_bluetooth_config_delegate.cc

@@ -6,8 +6,8 @@
 
 #include "ash/quick_pair/repository/fast_pair_repository.h"
 #include "base/callback_helpers.h"
-#include "chromeos/services/bluetooth_config/device_name_manager.h"
-#include "chromeos/services/bluetooth_config/public/cpp/device_image_info.h"
+#include "chromeos/ash/services/bluetooth_config/device_name_manager.h"
+#include "chromeos/ash/services/bluetooth_config/public/cpp/device_image_info.h"
 
 namespace ash {
 namespace quick_pair {

ash/quick_pair/keyed_service/fast_pair_bluetooth_config_delegate.h

@@ -7,7 +7,7 @@
 
 #include "base/observer_list.h"
 #include "base/observer_list_types.h"
-#include "chromeos/services/bluetooth_config/fast_pair_delegate.h"
+#include "chromeos/ash/services/bluetooth_config/fast_pair_delegate.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace chromeos {

ash/quick_pair/keyed_service/quick_pair_mediator.cc

@@ -33,7 +33,7 @@
 #include "ash/services/quick_pair/quick_pair_process.h"
 #include "ash/services/quick_pair/quick_pair_process_manager_impl.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "chromeos/services/bluetooth_config/fast_pair_delegate.h"
+#include "chromeos/ash/services/bluetooth_config/fast_pair_delegate.h"
 #include "components/prefs/pref_registry_simple.h"
 
 namespace ash {

ash/quick_pair/keyed_service/quick_pair_mediator.h

@@ -15,8 +15,8 @@
 #include "ash/quick_pair/ui/ui_broker.h"
 #include "base/memory/scoped_refptr.h"
 #include "base/scoped_observation.h"
-#include "chromeos/services/bluetooth_config/adapter_state_controller.h"
-#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h"
+#include "chromeos/ash/services/bluetooth_config/adapter_state_controller.h"
+#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
 

ash/quick_pair/keyed_service/quick_pair_mediator_unittest.cc

@@ -35,10 +35,10 @@
 #include "ash/test/ash_test_base.h"
 #include "ash/test/ash_test_helper.h"
 #include "base/memory/scoped_refptr.h"
-#include "chromeos/services/bluetooth_config/adapter_state_controller.h"
-#include "chromeos/services/bluetooth_config/fake_adapter_state_controller.h"
-#include "chromeos/services/bluetooth_config/fake_discovery_session_manager.h"
-#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h"
+#include "chromeos/ash/services/bluetooth_config/adapter_state_controller.h"
+#include "chromeos/ash/services/bluetooth_config/fake_adapter_state_controller.h"
+#include "chromeos/ash/services/bluetooth_config/fake_discovery_session_manager.h"
+#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h"
 #include "components/prefs/pref_registry.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/testing_pref_service.h"

ash/quick_pair/repository/BUILD.gn

@@ -50,7 +50,7 @@ source_set("repository") {
     "//ash/services/quick_pair/public/cpp",
     "//base",
     "//chromeos/ash/components/network",
-    "//chromeos/services/bluetooth_config/public/cpp",
+    "//chromeos/ash/services/bluetooth_config/public/cpp",
     "//components/image_fetcher/core",
     "//components/prefs",
     "//components/signin/public/identity_manager",
@@ -91,7 +91,7 @@ static_library("test_support") {
     "//base",
     "//base/test:test_support",
     "//chromeos/ash/components/network:test_support",
-    "//chromeos/services/bluetooth_config/public/cpp",
+    "//chromeos/ash/services/bluetooth_config/public/cpp",
     "//device/bluetooth",
     "//net",
     "//net/traffic_annotation:test_support",
@@ -128,7 +128,7 @@ source_set("unit_tests") {
     "//ash/services/quick_pair/public/cpp",
     "//base",
     "//base/test:test_support",
-    "//chromeos/services/bluetooth_config/public/cpp",
+    "//chromeos/ash/services/bluetooth_config/public/cpp",
     "//components/prefs:test_support",
     "//components/signin/public/identity_manager:test_support",
     "//crypto",

ash/quick_pair/repository/fake_device_metadata_http_fetcher.cc

@@ -8,7 +8,7 @@
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
-#include "chromeos/services/bluetooth_config/public/cpp/device_image_info.h"
+#include "chromeos/ash/services/bluetooth_config/public/cpp/device_image_info.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_status_code.h"

ash/quick_pair/repository/fake_fast_pair_repository.cc

@@ -10,7 +10,7 @@
 #include "base/containers/contains.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
-#include "chromeos/services/bluetooth_config/public/cpp/device_image_info.h"
+#include "chromeos/ash/services/bluetooth_config/public/cpp/device_image_info.h"
 #include "device/bluetooth/bluetooth_device.h"
 
 namespace ash {

ash/quick_pair/repository/fast_pair/device_image_store.cc

@@ -9,7 +9,7 @@
 #include "ash/quick_pair/proto/fastpair_data.pb.h"
 #include "ash/quick_pair/repository/fast_pair/fast_pair_image_decoder.h"
 #include "ash/shell.h"
-#include "chromeos/services/bluetooth_config/public/cpp/device_image_info.h"
+#include "chromeos/ash/services/bluetooth_config/public/cpp/device_image_info.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"

ash/quick_pair/repository/fast_pair/device_image_store.h

@@ -11,7 +11,7 @@
 #include "ash/quick_pair/repository/fast_pair/device_metadata.h"
 #include "base/callback.h"
 #include "base/values.h"
-#include "chromeos/services/bluetooth_config/public/cpp/device_image_info.h"
+#include "chromeos/ash/services/bluetooth_config/public/cpp/device_image_info.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "ui/gfx/image/image.h"
 

ash/quick_pair/repository/fast_pair/device_image_store_unittest.cc

@@ -13,7 +13,7 @@
 #include "base/callback_helpers.h"
 #include "base/test/gmock_callback_support.h"
 #include "base/test/mock_callback.h"
-#include "chromeos/services/bluetooth_config/public/cpp/device_image_info.h"
+#include "chromeos/ash/services/bluetooth_config/public/cpp/device_image_info.h"
 #include "components/prefs/pref_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"

ash/quick_pair/repository/fast_pair_repository.h

@@ -11,7 +11,7 @@
 #include "ash/quick_pair/repository/fast_pair/pairing_metadata.h"
 #include "base/callback.h"
 #include "base/containers/flat_map.h"
-#include "chromeos/services/bluetooth_config/public/cpp/device_image_info.h"
+#include "chromeos/ash/services/bluetooth_config/public/cpp/device_image_info.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace chromeos {

ash/quick_pair/repository/fast_pair_repository_impl.cc

@@ -24,7 +24,7 @@
 #include "base/strings/stringprintf.h"
 #include "chromeos/ash/components/network/network_handler.h"
 #include "chromeos/ash/components/network/network_state_handler.h"
-#include "chromeos/services/bluetooth_config/public/cpp/device_image_info.h"
+#include "chromeos/ash/services/bluetooth_config/public/cpp/device_image_info.h"
 #include "crypto/sha2.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"

ash/system/bluetooth/DEPS

@@ -1,5 +1,4 @@
 include_rules = [
-  "+chromeos/services/bluetooth_config",
   "+services/device/public",
 ]
 

ash/system/bluetooth/bluetooth_detailed_view.h

@@ -8,7 +8,7 @@
 #include <memory>
 
 #include "ash/ash_export.h"
-#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h"
+#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h"
 #include "ui/gfx/vector_icon_types.h"
 
 namespace views {

ash/system/bluetooth/bluetooth_detailed_view_controller.cc

@@ -12,7 +12,7 @@
 #include "ash/system/model/system_tray_model.h"
 #include "ash/system/unified/unified_system_tray_controller.h"
 #include "base/check.h"
-#include "chromeos/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h"
+#include "chromeos/ash/services/bluetooth_config/public/cpp/cros_bluetooth_config_util.h"
 #include "mojo/public/cpp/bindings/clone_traits.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "ui/base/l10n/l10n_util.h"

ash/system/bluetooth/bluetooth_detailed_view_controller.h

@@ -14,7 +14,7 @@
 #include "ash/system/bluetooth/bluetooth_device_list_controller.h"
 #include "ash/system/tray/detailed_view_delegate.h"
 #include "ash/system/unified/detailed_view_controller.h"
-#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h"
+#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
 

ash/system/bluetooth/bluetooth_detailed_view_controller_unittest.cc

@@ -22,11 +22,11 @@
 #include "base/run_loop.h"
 #include "base/strings/string_piece.h"
 #include "base/test/scoped_feature_list.h"
-#include "chromeos/services/bluetooth_config/fake_adapter_state_controller.h"
-#include "chromeos/services/bluetooth_config/fake_device_cache.h"
-#include "chromeos/services/bluetooth_config/fake_device_operation_handler.h"
-#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h"
-#include "chromeos/services/bluetooth_config/scoped_bluetooth_config_test_helper.h"
+#include "chromeos/ash/services/bluetooth_config/fake_adapter_state_controller.h"
+#include "chromeos/ash/services/bluetooth_config/fake_device_cache.h"
+#include "chromeos/ash/services/bluetooth_config/fake_device_operation_handler.h"
+#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h"
+#include "chromeos/ash/services/bluetooth_config/scoped_bluetooth_config_test_helper.h"
 #include "mojo/public/cpp/bindings/clone_traits.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 

ash/system/bluetooth/bluetooth_device_list_controller.h

@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "ash/ash_export.h"
-#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h"
+#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h"
 
 namespace ash {
 

ash/system/bluetooth/bluetooth_device_list_controller_impl.h

@@ -11,7 +11,7 @@
 #include "ash/ash_export.h"
 #include "ash/system/bluetooth/bluetooth_device_list_controller.h"
 #include "base/containers/flat_map.h"
-#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h"
+#include "chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h"
 
 namespace views {
 class Separator;