Move //chrome/browser/{chromeos => ash}/bluetooth
This CL is part of the Chrome OS source code directory migration:
https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE.
Change-Id: I9916bcaaa9d9537db646891d1e227341386d4c85
Bug: 1164001
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2797112
Reviewed-by: Hidehiko Abe <[email protected]>
Owners-Override: Hidehiko Abe <[email protected]>
Commit-Queue: Yeunjoo Choi <[email protected]>
Cr-Commit-Position: refs/heads/master@{#868478}
diff --git a/chrome/browser/chromeos/bluetooth/DIR_METADATA b/chrome/browser/ash/bluetooth/DIR_METADATA
similarity index 100%
rename from chrome/browser/chromeos/bluetooth/DIR_METADATA
rename to chrome/browser/ash/bluetooth/DIR_METADATA
diff --git a/chrome/browser/chromeos/bluetooth/OWNERS b/chrome/browser/ash/bluetooth/OWNERS
similarity index 100%
rename from chrome/browser/chromeos/bluetooth/OWNERS
rename to chrome/browser/ash/bluetooth/OWNERS
diff --git a/chrome/browser/chromeos/bluetooth/debug_logs_manager.cc b/chrome/browser/ash/bluetooth/debug_logs_manager.cc
similarity index 98%
rename from chrome/browser/chromeos/bluetooth/debug_logs_manager.cc
rename to chrome/browser/ash/bluetooth/debug_logs_manager.cc
index df73b33..a32b09c 100644
--- a/chrome/browser/chromeos/bluetooth/debug_logs_manager.cc
+++ b/chrome/browser/ash/bluetooth/debug_logs_manager.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/bluetooth/debug_logs_manager.h"
+#include "chrome/browser/ash/bluetooth/debug_logs_manager.h"
#include "ash/constants/ash_features.h"
#include "base/feature_list.h"
diff --git a/chrome/browser/chromeos/bluetooth/debug_logs_manager.h b/chrome/browser/ash/bluetooth/debug_logs_manager.h
similarity index 92%
rename from chrome/browser/chromeos/bluetooth/debug_logs_manager.h
rename to chrome/browser/ash/bluetooth/debug_logs_manager.h
index 588db4f..1a769c23 100644
--- a/chrome/browser/chromeos/bluetooth/debug_logs_manager.h
+++ b/chrome/browser/ash/bluetooth/debug_logs_manager.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_BLUETOOTH_DEBUG_LOGS_MANAGER_H_
-#define CHROME_BROWSER_CHROMEOS_BLUETOOTH_DEBUG_LOGS_MANAGER_H_
+#ifndef CHROME_BROWSER_ASH_BLUETOOTH_DEBUG_LOGS_MANAGER_H_
+#define CHROME_BROWSER_ASH_BLUETOOTH_DEBUG_LOGS_MANAGER_H_
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
@@ -72,4 +72,4 @@
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_BLUETOOTH_DEBUG_LOGS_MANAGER_H_
+#endif // CHROME_BROWSER_ASH_BLUETOOTH_DEBUG_LOGS_MANAGER_H_
diff --git a/chrome/browser/chromeos/bluetooth/debug_logs_manager_factory.cc b/chrome/browser/ash/bluetooth/debug_logs_manager_factory.cc
similarity index 94%
rename from chrome/browser/chromeos/bluetooth/debug_logs_manager_factory.cc
rename to chrome/browser/ash/bluetooth/debug_logs_manager_factory.cc
index f4367ca3..f42b7398 100644
--- a/chrome/browser/chromeos/bluetooth/debug_logs_manager_factory.cc
+++ b/chrome/browser/ash/bluetooth/debug_logs_manager_factory.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/bluetooth/debug_logs_manager_factory.h"
+#include "chrome/browser/ash/bluetooth/debug_logs_manager_factory.h"
#include "base/memory/singleton.h"
+#include "chrome/browser/ash/bluetooth/debug_logs_manager.h"
#include "chrome/browser/ash/profiles/profile_helper.h"
-#include "chrome/browser/chromeos/bluetooth/debug_logs_manager.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/signin/identity_manager_factory.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
diff --git a/chrome/browser/chromeos/bluetooth/debug_logs_manager_factory.h b/chrome/browser/ash/bluetooth/debug_logs_manager_factory.h
similarity index 83%
rename from chrome/browser/chromeos/bluetooth/debug_logs_manager_factory.h
rename to chrome/browser/ash/bluetooth/debug_logs_manager_factory.h
index 894d98a..ff723c5 100644
--- a/chrome/browser/chromeos/bluetooth/debug_logs_manager_factory.h
+++ b/chrome/browser/ash/bluetooth/debug_logs_manager_factory.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_BLUETOOTH_DEBUG_LOGS_MANAGER_FACTORY_H_
-#define CHROME_BROWSER_CHROMEOS_BLUETOOTH_DEBUG_LOGS_MANAGER_FACTORY_H_
+#ifndef CHROME_BROWSER_ASH_BLUETOOTH_DEBUG_LOGS_MANAGER_FACTORY_H_
+#define CHROME_BROWSER_ASH_BLUETOOTH_DEBUG_LOGS_MANAGER_FACTORY_H_
#include "base/memory/singleton.h"
#include "components/keyed_service/content/browser_context_keyed_service_factory.h"
@@ -41,4 +41,4 @@
} // namespace chromeos
-#endif // CHROME_BROWSER_CHROMEOS_BLUETOOTH_DEBUG_LOGS_MANAGER_FACTORY_H_
+#endif // CHROME_BROWSER_ASH_BLUETOOTH_DEBUG_LOGS_MANAGER_FACTORY_H_
diff --git a/chrome/browser/chromeos/bluetooth/debug_logs_manager_unittest.cc b/chrome/browser/ash/bluetooth/debug_logs_manager_unittest.cc
similarity index 98%
rename from chrome/browser/chromeos/bluetooth/debug_logs_manager_unittest.cc
rename to chrome/browser/ash/bluetooth/debug_logs_manager_unittest.cc
index 78b8d40..a7ec6df 100644
--- a/chrome/browser/chromeos/bluetooth/debug_logs_manager_unittest.cc
+++ b/chrome/browser/ash/bluetooth/debug_logs_manager_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/bluetooth/debug_logs_manager.h"
+#include "chrome/browser/ash/bluetooth/debug_logs_manager.h"
#include <memory>
diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn
index 3a9526c..190413d 100644
--- a/chrome/browser/chromeos/BUILD.gn
+++ b/chrome/browser/chromeos/BUILD.gn
@@ -891,6 +891,10 @@
"../ash/base/file_flusher.h",
"../ash/base/locale_util.cc",
"../ash/base/locale_util.h",
+ "../ash/bluetooth/debug_logs_manager.cc",
+ "../ash/bluetooth/debug_logs_manager.h",
+ "../ash/bluetooth/debug_logs_manager_factory.cc",
+ "../ash/bluetooth/debug_logs_manager_factory.h",
"../ash/borealis/borealis_app_launcher.cc",
"../ash/borealis/borealis_app_launcher.h",
"../ash/borealis/borealis_app_uninstaller.cc",
@@ -1689,10 +1693,6 @@
"android_sms/fcm_connection_establisher.h",
"android_sms/pairing_lost_notifier.cc",
"android_sms/pairing_lost_notifier.h",
- "bluetooth/debug_logs_manager.cc",
- "bluetooth/debug_logs_manager.h",
- "bluetooth/debug_logs_manager_factory.cc",
- "bluetooth/debug_logs_manager_factory.h",
"boot_times_recorder.cc",
"boot_times_recorder.h",
"browser_context_keyed_service_factories.cc",
@@ -3617,6 +3617,7 @@
"../ash/authpolicy/authpolicy_credentials_manager_unittest.cc",
"../ash/authpolicy/authpolicy_helper_unittest.cc",
"../ash/base/file_flusher_unittest.cc",
+ "../ash/bluetooth/debug_logs_manager_unittest.cc",
"../ash/borealis/borealis_app_launcher_unittest.cc",
"../ash/borealis/borealis_context_manager_unittest.cc",
"../ash/borealis/borealis_context_unittest.cc",
@@ -3764,7 +3765,6 @@
"android_sms/connection_manager_unittest.cc",
"android_sms/fcm_connection_establisher_unittest.cc",
"android_sms/pairing_lost_notifier_unittest.cc",
- "bluetooth/debug_logs_manager_unittest.cc",
"camera_mic/vm_camera_mic_manager_unittest.cc",
"child_accounts/child_user_service_unittest.cc",
"child_accounts/event_based_status_reporting_service_unittest.cc",
diff --git a/chrome/browser/chromeos/browser_context_keyed_service_factories.cc b/chrome/browser/chromeos/browser_context_keyed_service_factories.cc
index 8149022..70494a7 100644
--- a/chrome/browser/chromeos/browser_context_keyed_service_factories.cc
+++ b/chrome/browser/chromeos/browser_context_keyed_service_factories.cc
@@ -7,6 +7,7 @@
#include "chrome/browser/ash/account_manager/account_manager_migrator.h"
#include "chrome/browser/ash/arc/accessibility/arc_accessibility_helper_bridge.h"
#include "chrome/browser/ash/authpolicy/authpolicy_credentials_manager.h"
+#include "chrome/browser/ash/bluetooth/debug_logs_manager_factory.h"
#include "chrome/browser/ash/borealis/borealis_service_factory.h"
#include "chrome/browser/ash/cert_provisioning/cert_provisioning_scheduler_user_service.h"
#include "chrome/browser/ash/guest_os/guest_os_registry_service_factory.h"
@@ -15,7 +16,6 @@
#include "chrome/browser/ash/plugin_vm/plugin_vm_engagement_metrics_service.h"
#include "chrome/browser/ash/web_applications/crosh_loader_factory.h"
#include "chrome/browser/chromeos/android_sms/android_sms_service_factory.h"
-#include "chrome/browser/chromeos/bluetooth/debug_logs_manager_factory.h"
#include "chrome/browser/chromeos/crostini/crostini_engagement_metrics_service.h"
#include "chrome/browser/chromeos/eche_app/eche_app_manager_factory.h"
#include "chrome/browser/chromeos/extensions/file_manager/event_router_factory.h"
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index f092530..b95c124 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -262,8 +262,8 @@
#include "chrome/browser/ash/apps/apk_web_app_service.h"
#include "chrome/browser/ash/arc/policy/arc_policy_bridge.h"
#include "chrome/browser/ash/arc/session/arc_session_manager.h"
+#include "chrome/browser/ash/bluetooth/debug_logs_manager.h"
#include "chrome/browser/ash/cert_provisioning/cert_provisioning_common.h"
-#include "chrome/browser/chromeos/bluetooth/debug_logs_manager.h"
#include "chrome/browser/chromeos/child_accounts/family_user_chrome_activity_metrics.h"
#include "chrome/browser/chromeos/child_accounts/family_user_metrics_service.h"
#include "chrome/browser/chromeos/child_accounts/family_user_session_metrics.h"
diff --git a/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_handler.cc b/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_handler.cc
index 479002c..95efc511 100644
--- a/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_handler.cc
+++ b/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_handler.cc
@@ -11,7 +11,6 @@
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "build/chromeos_buildflags.h"
-#include "chrome/browser/chromeos/bluetooth/debug_logs_manager.h"
#include "device/bluetooth/adapter.h"
#include "device/bluetooth/bluetooth_adapter_factory.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
@@ -19,7 +18,7 @@
#include "url/gurl.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "chrome/browser/chromeos/bluetooth/debug_logs_manager.h"
+#include "chrome/browser/ash/bluetooth/debug_logs_manager.h"
#endif
BluetoothInternalsHandler::BluetoothInternalsHandler(
diff --git a/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.cc b/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.cc
index 5f0efbb..4d870a3 100644
--- a/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.cc
+++ b/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.cc
@@ -17,7 +17,7 @@
#include "ui/resources/grit/webui_generated_resources.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "chrome/browser/chromeos/bluetooth/debug_logs_manager_factory.h"
+#include "chrome/browser/ash/bluetooth/debug_logs_manager_factory.h"
#endif
BluetoothInternalsUI::BluetoothInternalsUI(content::WebUI* web_ui)
