Move {ash => chromeos/ash}/components/audio/
ChromeOS components and services are meant to live in chromeos/,
separate from Ash shell code. Fix a previous migration that used the
wrong directory.
This CL is part of the ChromeOS source code directory migration:
https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE.
Bug: 1164001
Change-Id: Idfa0140faafb4d4135ebea2e6ff05f4975fd6a81
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3779526
Owners-Override: Hidehiko Abe <[email protected]>
Reviewed-by: Hidehiko Abe <[email protected]>
Commit-Queue: Henrique Ferreiro <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1036040}
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index f96a33f6..b75e11e1 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -5084,8 +5084,6 @@
"//ash/components/arc/enterprise",
"//ash/components/arc/mojom",
"//ash/components/arc/mojom",
- "//ash/components/audio",
- "//ash/components/audio/public/mojom",
"//ash/components/device_activity:device_activity",
"//ash/components/geolocation",
"//ash/components/login/session",
@@ -5192,6 +5190,8 @@
"//chrome/services/speech:lib",
"//chromeos/ash/components/account_manager",
"//chromeos/ash/components/assistant:buildflags",
+ "//chromeos/ash/components/audio",
+ "//chromeos/ash/components/audio/public/mojom",
"//chromeos/ash/components/dbus/attestation",
"//chromeos/ash/components/dbus/attestation:attestation_proto",
"//chromeos/ash/components/dbus/concierge",
diff --git a/chrome/browser/ash/BUILD.gn b/chrome/browser/ash/BUILD.gn
index d55a72c..d59f09ac 100644
--- a/chrome/browser/ash/BUILD.gn
+++ b/chrome/browser/ash/BUILD.gn
@@ -1512,7 +1512,6 @@
"//ash/components/arc/session",
"//ash/components/arc/session:arc_base_enums",
"//ash/components/arc/session:connection_holder",
- "//ash/components/audio",
"//ash/components/cryptohome",
"//ash/components/disks",
"//ash/components/drivefs",
@@ -1566,6 +1565,7 @@
"//chrome/services/keymaster/public/mojom",
"//chrome/services/printing/public/mojom",
"//chromeos/ash/components/attestation",
+ "//chromeos/ash/components/audio",
"//chromeos/ash/components/browser_context_helper",
"//chromeos/ash/components/dbus:metrics_event_proto",
"//chromeos/ash/components/dbus:vm_applications_apps_proto",
diff --git a/chrome/browser/ash/accessibility/accessibility_manager.cc b/chrome/browser/ash/accessibility/accessibility_manager.cc
index e430498..e8ea6ef5 100644
--- a/chrome/browser/ash/accessibility/accessibility_manager.cc
+++ b/chrome/browser/ash/accessibility/accessibility_manager.cc
@@ -11,7 +11,6 @@
#include "ash/accessibility/autoclick/autoclick_controller.h"
#include "ash/accessibility/sticky_keys/sticky_keys_controller.h"
-#include "ash/components/audio/sounds.h"
#include "ash/constants/ash_constants.h"
#include "ash/constants/ash_pref_names.h"
#include "ash/constants/ash_switches.h"
@@ -67,6 +66,7 @@
#include "chrome/common/url_constants.h"
#include "chrome/grit/browser_resources.h"
#include "chrome/grit/generated_resources.h"
+#include "chromeos/ash/components/audio/sounds.h"
#include "chromeos/ash/components/dbus/upstart/upstart_client.h"
#include "chromeos/constants/devicetype.h"
#include "chromeos/dbus/power/power_manager_client.h"
diff --git a/chrome/browser/ash/accessibility/accessibility_manager.h b/chrome/browser/ash/accessibility/accessibility_manager.h
index 36627059..4ca63af 100644
--- a/chrome/browser/ash/accessibility/accessibility_manager.h
+++ b/chrome/browser/ash/accessibility/accessibility_manager.h
@@ -11,7 +11,6 @@
#include <string>
#include <vector>
-#include "ash/components/audio/cras_audio_handler.h"
#include "base/callback_forward.h"
#include "base/callback_list.h"
#include "base/memory/weak_ptr.h"
@@ -23,6 +22,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_observer.h"
#include "chrome/common/extensions/api/accessibility_private.h"
+#include "chromeos/ash/components/audio/cras_audio_handler.h"
#include "components/prefs/pref_change_registrar.h"
#include "components/session_manager/core/session_manager.h"
#include "components/session_manager/core/session_manager_observer.h"
@@ -286,7 +286,7 @@
// Plays an earcon. Earcons are brief and distinctive sounds that indicate
// the their mapped event has occurred. The |sound_key| enums can be found in
- // ash/components/audio/sounds.h.
+ // chromeos/ash/components/audio/sounds.h.
bool PlayEarcon(Sound sound_key, PlaySoundOption option);
// Forward an accessibility gesture from the touch exploration controller
diff --git a/chrome/browser/ash/audio/audio_survey_handler.h b/chrome/browser/ash/audio/audio_survey_handler.h
index 8b96869..d24b53f 100644
--- a/chrome/browser/ash/audio/audio_survey_handler.h
+++ b/chrome/browser/ash/audio/audio_survey_handler.h
@@ -5,9 +5,9 @@
#ifndef CHROME_BROWSER_ASH_AUDIO_AUDIO_SURVEY_HANDLER_H_
#define CHROME_BROWSER_ASH_AUDIO_AUDIO_SURVEY_HANDLER_H_
-#include "ash/components/audio/cras_audio_handler.h"
#include "chrome/browser/ash/hats/hats_notification_controller.h"
#include "chrome/browser/profiles/profile.h"
+#include "chromeos/ash/components/audio/cras_audio_handler.h"
namespace ash {
diff --git a/chrome/browser/ash/camera_mic/vm_camera_mic_manager.h b/chrome/browser/ash/camera_mic/vm_camera_mic_manager.h
index 6adeda5..3cbe46e 100644
--- a/chrome/browser/ash/camera_mic/vm_camera_mic_manager.h
+++ b/chrome/browser/ash/camera_mic/vm_camera_mic_manager.h
@@ -8,11 +8,11 @@
#include <bitset>
#include <memory>
-#include "ash/components/audio/cras_audio_handler.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "base/observer_list_types.h"
#include "base/scoped_observation.h"
+#include "chromeos/ash/components/audio/cras_audio_handler.h"
#include "components/keyed_service/core/keyed_service.h"
#include "media/capture/video/chromeos/camera_hal_dispatcher_impl.h"
#include "ui/message_center/public/cpp/notification.h"
diff --git a/chrome/browser/ash/chrome_browser_main_parts_ash.cc b/chrome/browser/ash/chrome_browser_main_parts_ash.cc
index 60e94081..b65413c 100644
--- a/chrome/browser/ash/chrome_browser_main_parts_ash.cc
+++ b/chrome/browser/ash/chrome_browser_main_parts_ash.cc
@@ -13,8 +13,6 @@
#include "ash/components/arc/arc_util.h"
#include "ash/components/arc/enterprise/arc_data_snapshotd_manager.h"
-#include "ash/components/audio/audio_devices_pref_handler_impl.h"
-#include "ash/components/audio/cras_audio_handler.h"
#include "ash/components/cryptohome/cryptohome_parameters.h"
#include "ash/components/cryptohome/system_salt_getter.h"
#include "ash/components/device_activity/device_active_use_case.h"
@@ -196,6 +194,8 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/logging_chrome.h"
#include "chrome/common/pref_names.h"
+#include "chromeos/ash/components/audio/audio_devices_pref_handler_impl.h"
+#include "chromeos/ash/components/audio/cras_audio_handler.h"
#include "chromeos/ash/components/browser_context_helper/browser_context_helper.h"
#include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
#include "chromeos/ash/components/dbus/services/cros_dbus_service.h"
diff --git a/chrome/browser/ash/crosapi/audio_service_ash_unittest.cc b/chrome/browser/ash/crosapi/audio_service_ash_unittest.cc
index 38860b9..f4ab1b98 100644
--- a/chrome/browser/ash/crosapi/audio_service_ash_unittest.cc
+++ b/chrome/browser/ash/crosapi/audio_service_ash_unittest.cc
@@ -4,8 +4,8 @@
#include "chrome/browser/ash/crosapi/audio_service_ash.h"
-#include "ash/components/audio/cras_audio_handler.h"
#include "chrome/test/base/testing_profile.h"
+#include "chromeos/ash/components/audio/cras_audio_handler.h"
#include "chromeos/ash/components/dbus/audio/fake_cras_audio_client.h"
#include "content/public/test/browser_task_environment.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/ash/login/lock/screen_locker.cc b/chrome/browser/ash/login/lock/screen_locker.cc
index 36b07cc..8120a8a 100644
--- a/chrome/browser/ash/login/lock/screen_locker.cc
+++ b/chrome/browser/ash/login/lock/screen_locker.cc
@@ -6,7 +6,6 @@
#include <algorithm>
-#include "ash/components/audio/sounds.h"
#include "ash/components/login/auth/authenticator.h"
#include "ash/components/login/auth/extended_authenticator.h"
#include "ash/components/login/auth/public/auth_failure.h"
@@ -57,6 +56,7 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/grit/browser_resources.h"
#include "chrome/grit/generated_resources.h"
+#include "chromeos/ash/components/audio/sounds.h"
#include "chromeos/ash/components/dbus/biod/constants.pb.h"
#include "chromeos/ash/components/dbus/session_manager/session_manager_client.h"
#include "components/password_manager/core/browser/hash_password_manager.h"
diff --git a/chrome/browser/ash/login/lock/screen_locker_unittest.cc b/chrome/browser/ash/login/lock/screen_locker_unittest.cc
index 94806ba..68d9f5a1 100644
--- a/chrome/browser/ash/login/lock/screen_locker_unittest.cc
+++ b/chrome/browser/ash/login/lock/screen_locker_unittest.cc
@@ -6,7 +6,6 @@
#include <memory>
-#include "ash/components/audio/cras_audio_handler.h"
#include "ash/components/cryptohome/system_salt_getter.h"
#include "ash/components/login/session/session_termination_manager.h"
#include "ash/public/cpp/login_screen_model.h"
@@ -34,6 +33,7 @@
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/testing_profile_manager.h"
+#include "chromeos/ash/components/audio/cras_audio_handler.h"
#include "chromeos/ash/components/dbus/audio/cras_audio_client.h"
#include "chromeos/ash/components/dbus/biod/biod_client.h"
#include "chromeos/ash/components/dbus/concierge/concierge_client.h"
diff --git a/chrome/browser/ash/login/session/user_session_initializer.cc b/chrome/browser/ash/login/session/user_session_initializer.cc
index 0de719a3..8dda7a1 100644
--- a/chrome/browser/ash/login/session/user_session_initializer.cc
+++ b/chrome/browser/ash/login/session/user_session_initializer.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/ash/login/session/user_session_initializer.h"
-#include "ash/components/audio/cras_audio_handler.h"
#include "ash/components/peripheral_notification/peripheral_notification_manager.h"
#include "ash/constants/ash_features.h"
#include "ash/constants/ash_pref_names.h"
@@ -46,6 +45,7 @@
#include "chrome/browser/ui/ash/media_client_impl.h"
#include "chrome/browser/ui/webui/settings/chromeos/peripheral_data_access_handler.h"
#include "chrome/common/pref_names.h"
+#include "chromeos/ash/components/audio/cras_audio_handler.h"
#include "chromeos/ash/components/dbus/pciguard/pciguard_client.h"
#include "chromeos/ash/components/install_attributes/install_attributes.h"
#include "chromeos/ash/components/network/network_cert_loader.h"
diff --git a/chrome/browser/ash/login/ui/login_display_host_webui.cc b/chrome/browser/ash/login/ui/login_display_host_webui.cc
index ab041cea..d324324 100644
--- a/chrome/browser/ash/login/ui/login_display_host_webui.cc
+++ b/chrome/browser/ash/login/ui/login_display_host_webui.cc
@@ -9,7 +9,6 @@
#include <vector>
#include "ash/accessibility/ui/focus_ring_controller.h"
-#include "ash/components/audio/sounds.h"
#include "ash/components/settings/cros_settings_names.h"
#include "ash/components/settings/cros_settings_provider.h"
#include "ash/components/settings/timezone_settings.h"
@@ -80,6 +79,7 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/grit/browser_resources.h"
+#include "chromeos/ash/components/audio/sounds.h"
#include "chromeos/ash/components/dbus/session_manager/session_manager_client.h"
#include "chromeos/login/login_state/login_state.h"
#include "components/account_id/account_id.h"
diff --git a/chrome/browser/ash/login/ui/login_display_host_webui.h b/chrome/browser/ash/login/ui/login_display_host_webui.h
index 75d570aa..51c345ca 100644
--- a/chrome/browser/ash/login/ui/login_display_host_webui.h
+++ b/chrome/browser/ash/login/ui/login_display_host_webui.h
@@ -10,7 +10,6 @@
#include <memory>
#include <vector>
-#include "ash/components/audio/cras_audio_handler.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "base/scoped_observation.h"
@@ -23,6 +22,7 @@
#include "chrome/browser/ash/login/ui/login_display_host_common.h"
#include "chrome/browser/ash/login/wizard_controller.h"
#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
+#include "chromeos/ash/components/audio/cras_audio_handler.h"
#include "chromeos/ash/components/dbus/session_manager/session_manager_client.h"
#include "components/session_manager/core/session_manager.h"
#include "components/session_manager/core/session_manager_observer.h"
diff --git a/chrome/browser/ash/login/wizard_controller.cc b/chrome/browser/ash/login/wizard_controller.cc
index 0f3fda8..b589374 100644
--- a/chrome/browser/ash/login/wizard_controller.cc
+++ b/chrome/browser/ash/login/wizard_controller.cc
@@ -17,7 +17,6 @@
#include "ash/components/arc/arc_prefs.h"
#include "ash/components/arc/arc_util.h"
#include "ash/components/arc/session/arc_bridge_service.h"
-#include "ash/components/audio/cras_audio_handler.h"
#include "ash/components/geolocation/simple_geolocation_provider.h"
#include "ash/components/settings/cros_settings_names.h"
#include "ash/components/settings/cros_settings_provider.h"
@@ -187,6 +186,7 @@
#include "chrome/browser/ui/webui/help/help_utils_chromeos.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/pref_names.h"
+#include "chromeos/ash/components/audio/cras_audio_handler.h"
#include "chromeos/ash/components/dbus/session_manager/session_manager_client.h"
#include "chromeos/ash/components/dbus/update_engine/update_engine_client.h"
#include "chromeos/ash/components/network/network_handler.h"
diff --git a/chrome/browser/ash/login/wizard_controller_browsertest.cc b/chrome/browser/ash/login/wizard_controller_browsertest.cc
index eecc348..82facea 100644
--- a/chrome/browser/ash/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/ash/login/wizard_controller_browsertest.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/ash/login/wizard_controller.h"
-#include "ash/components/audio/cras_audio_handler.h"
#include "ash/components/geolocation/simple_geolocation_provider.h"
#include "ash/components/settings/timezone_settings.h"
#include "ash/components/timezone/timezone_request.h"
@@ -88,6 +87,7 @@
#include "chrome/common/pref_names.h"
#include "chrome/grit/generated_resources.h"
#include "chrome/test/base/testing_profile.h"
+#include "chromeos/ash/components/audio/cras_audio_handler.h"
#include "chromeos/ash/components/dbus/session_manager/fake_session_manager_client.h"
#include "chromeos/ash/components/dbus/shill/fake_shill_manager_client.h"
#include "chromeos/ash/components/dbus/system_clock/system_clock_client.h"
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_set_volume_job.cc b/chrome/browser/ash/policy/remote_commands/device_command_set_volume_job.cc
index d425ce0..1481b79 100644
--- a/chrome/browser/ash/policy/remote_commands/device_command_set_volume_job.cc
+++ b/chrome/browser/ash/policy/remote_commands/device_command_set_volume_job.cc
@@ -7,12 +7,12 @@
#include <memory>
#include <utility>
-#include "ash/components/audio/cras_audio_handler.h"
#include "base/bind.h"
#include "base/json/json_reader.h"
#include "base/syslog_logging.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/values.h"
+#include "chromeos/ash/components/audio/cras_audio_handler.h"
#include "components/policy/proto/device_management_backend.pb.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_set_volume_job_unittest.cc b/chrome/browser/ash/policy/remote_commands/device_command_set_volume_job_unittest.cc
index ea5cb8c..745f8222 100644
--- a/chrome/browser/ash/policy/remote_commands/device_command_set_volume_job_unittest.cc
+++ b/chrome/browser/ash/policy/remote_commands/device_command_set_volume_job_unittest.cc
@@ -6,7 +6,6 @@
#include <memory>
-#include "ash/components/audio/cras_audio_handler.h"
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/json/json_writer.h"
@@ -15,6 +14,7 @@
#include "base/time/time.h"
#include "base/values.h"
#include "chrome/test/base/chrome_ash_test_base.h"
+#include "chromeos/ash/components/audio/cras_audio_handler.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace policy {
diff --git a/chrome/browser/ash/policy/status_collector/device_status_collector.cc b/chrome/browser/ash/policy/status_collector/device_status_collector.cc
index e7935c3..e7a0cb8 100644
--- a/chrome/browser/ash/policy/status_collector/device_status_collector.cc
+++ b/chrome/browser/ash/policy/status_collector/device_status_collector.cc
@@ -19,7 +19,6 @@
#include "ash/components/arc/mojom/enterprise_reporting.mojom.h"
#include "ash/components/arc/session/arc_bridge_service.h"
#include "ash/components/arc/session/arc_service_manager.h"
-#include "ash/components/audio/cras_audio_handler.h"
#include "ash/components/disks/disk_mount_manager.h"
#include "ash/components/settings/cros_settings_names.h"
#include "ash/components/settings/timezone_settings.h"
@@ -67,6 +66,7 @@
#include "chrome/common/channel_info.h"
#include "chrome/common/chrome_features.h"
#include "chrome/common/pref_names.h"
+#include "chromeos/ash/components/audio/cras_audio_handler.h"
#include "chromeos/ash/components/dbus/attestation/attestation_client.h"
#include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h"
#include "chromeos/ash/components/dbus/hermes/hermes_euicc_client.h"
diff --git a/chrome/browser/ash/policy/status_collector/device_status_collector_browsertest.cc b/chrome/browser/ash/policy/status_collector/device_status_collector_browsertest.cc
index ab61a7a..75fd297 100644
--- a/chrome/browser/ash/policy/status_collector/device_status_collector_browsertest.cc
+++ b/chrome/browser/ash/policy/status_collector/device_status_collector_browsertest.cc
@@ -13,7 +13,6 @@
#include <utility>
#include <vector>
-#include "ash/components/audio/cras_audio_handler.h"
#include "ash/components/disks/disk_mount_manager.h"
#include "ash/components/disks/mock_disk_mount_manager.h"
#include "ash/components/settings/cros_settings_names.h"
@@ -64,6 +63,7 @@
#include "chrome/test/base/chrome_unit_test_suite.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile_manager.h"
+#include "chromeos/ash/components/audio/cras_audio_handler.h"
#include "chromeos/ash/components/dbus/attestation/attestation_client.h"
#include "chromeos/ash/components/dbus/cicerone/cicerone_client.h"
#include "chromeos/ash/components/dbus/concierge/concierge_client.h"
diff --git a/chrome/browser/chrome_browser_interface_binders.cc b/chrome/browser/chrome_browser_interface_binders.cc
index 8ec9e3b..dba905b 100644
--- a/chrome/browser/chrome_browser_interface_binders.cc
+++ b/chrome/browser/chrome_browser_interface_binders.cc
@@ -201,7 +201,6 @@
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS_ASH)
-#include "ash/components/audio/public/mojom/cros_audio_config.mojom.h"
#include "ash/services/cellular_setup/public/mojom/cellular_setup.mojom.h"
#include "ash/services/cellular_setup/public/mojom/esim_manager.mojom.h"
#include "ash/services/multidevice_setup/multidevice_setup_service.h"
@@ -279,6 +278,7 @@
#include "chrome/browser/ui/webui/settings/ash/search/search.mojom.h"
#include "chrome/browser/ui/webui/settings/ash/search/user_action_recorder.mojom.h"
#include "chrome/browser/ui/webui/settings/chromeos/os_settings_ui.h"
+#include "chromeos/ash/components/audio/public/mojom/cros_audio_config.mojom.h"
#include "chromeos/ash/components/local_search_service/public/mojom/index.mojom.h"
#include "chromeos/ash/services/auth_factor_config/public/mojom/auth_factor_config.mojom.h"
#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom.h"
diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn
index 816ccdcc..3fb5c5c 100644
--- a/chrome/browser/chromeos/BUILD.gn
+++ b/chrome/browser/chromeos/BUILD.gn
@@ -88,7 +88,6 @@
"//ash/components/arc/input_overlay/resources:resources_grit",
"//ash/components/arc/media_session",
"//ash/components/arc/mojom",
- "//ash/components/audio",
"//ash/components/cryptohome",
"//ash/components/device_activity",
"//ash/components/disks",
@@ -248,6 +247,7 @@
"//chromeos/ash/components/account_manager",
"//chromeos/ash/components/assistant:buildflags",
"//chromeos/ash/components/attestation",
+ "//chromeos/ash/components/audio",
"//chromeos/ash/components/browser_context_helper",
"//chromeos/ash/components/dbus:metrics_event_proto",
"//chromeos/ash/components/dbus:plugin_vm_service_proto",
@@ -3593,7 +3593,6 @@
"//ash:test_support",
"//ash/components/arc:arc_test_support",
"//ash/components/arc:notification_test_support",
- "//ash/components/audio",
"//ash/components/disks:test_support",
"//ash/components/login/auth",
"//ash/components/multidevice:test_support",
@@ -3640,6 +3639,7 @@
"//chrome/test:test_support_ui",
"//chrome/test:test_support_unit",
"//chromeos/ash/components/attestation:test_support",
+ "//chromeos/ash/components/audio",
"//chromeos/ash/components/dbus:test_support",
"//chromeos/ash/components/dbus/anomaly_detector",
"//chromeos/ash/components/dbus/attestation",
diff --git a/chrome/browser/policy/BUILD.gn b/chrome/browser/policy/BUILD.gn
index 09a1c52d..6cf1bcd 100644
--- a/chrome/browser/policy/BUILD.gn
+++ b/chrome/browser/policy/BUILD.gn
@@ -347,10 +347,10 @@
"//ash/components/arc:arc_test_support",
"//ash/components/arc:prefs",
"//ash/components/arc/session:session",
- "//ash/components/audio:audio",
"//ash/components/cryptohome",
"//chrome/browser/ash",
"//chrome/browser/ash/system_web_apps/test_support",
+ "//chromeos/ash/components/audio",
"//chromeos/ash/components/dbus/userdataauth",
"//chromeos/ash/services/assistant/public/cpp",
"//chromeos/dbus/constants",
diff --git a/chrome/browser/policy/DEPS b/chrome/browser/policy/DEPS
index c8e3709..af3a0e9 100644
--- a/chrome/browser/policy/DEPS
+++ b/chrome/browser/policy/DEPS
@@ -1,12 +1,8 @@
specific_include_rules = {
- "audio_output_allowed_browsertest\.cc": [
- "+ash/components/audio",
- ],
"media_stream_policy_browsertest\.cc": [
"+components/webrtc",
],
"policy_browsertest\.cc": [
- "+ash/shell.h",
"+content/common/content_navigation_policy.h",
],
"screenshot_policy_browsertest\.cc": [
diff --git a/chrome/browser/policy/test/audio_output_allowed_browsertest.cc b/chrome/browser/policy/test/audio_output_allowed_browsertest.cc
index 632df48..8ad16d9 100644
--- a/chrome/browser/policy/test/audio_output_allowed_browsertest.cc
+++ b/chrome/browser/policy/test/audio_output_allowed_browsertest.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/components/audio/cras_audio_handler.h"
#include "base/values.h"
#include "chrome/browser/policy/policy_test_utils.h"
+#include "chromeos/ash/components/audio/cras_audio_handler.h"
#include "components/policy/core/common/policy_map.h"
#include "components/policy/core/common/policy_types.h"
#include "components/policy/policy_constants.h"
diff --git a/chrome/browser/prefs/DEPS b/chrome/browser/prefs/DEPS
index ca72ca4..81e15f0e 100644
--- a/chrome/browser/prefs/DEPS
+++ b/chrome/browser/prefs/DEPS
@@ -1,8 +1,3 @@
-include_rules = [
- "+ash/components/audio",
- "+services/preferences/public/mojom",
-]
-
# TODO(crbug.com/654988): Remove once the pref service is always used.
specific_include_rules = {
"profile_pref_store_manager\.cc": [
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 69ee59f..c45de5b6 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -293,7 +293,6 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "ash/components/arc/arc_prefs.h"
-#include "ash/components/audio/audio_devices_pref_handler_impl.h"
#include "ash/components/device_activity/device_activity_controller.h"
#include "ash/components/timezone/timezone_resolver.h"
#include "ash/constants/ash_pref_names.h"
@@ -394,6 +393,7 @@
#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
#include "chrome/browser/ui/webui/settings/chromeos/os_settings_ui.h"
#include "chrome/browser/upgrade_detector/upgrade_detector_chromeos.h"
+#include "chromeos/ash/components/audio/audio_devices_pref_handler_impl.h"
#include "chromeos/ash/components/local_search_service/search_metrics_reporter.h"
#include "chromeos/ash/components/network/cellular_esim_profile_handler_impl.h"
#include "chromeos/ash/components/network/cellular_metrics_logger.h"
diff --git a/chrome/browser/resources/settings/chromeos/BUILD.gn b/chrome/browser/resources/settings/chromeos/BUILD.gn
index 2ee4e89..1db5921 100644
--- a/chrome/browser/resources/settings/chromeos/BUILD.gn
+++ b/chrome/browser/resources/settings/chromeos/BUILD.gn
@@ -153,8 +153,8 @@
}
copy("generate_cros_audio_config_mojo_webui") {
- deps = [ "//ash/components/audio/public/mojom:mojom_webui_js" ]
- sources = [ "$root_gen_dir/mojom-webui/ash/components/audio/public/mojom/cros_audio_config.mojom-webui.js" ]
+ deps = [ "//chromeos/ash/components/audio/public/mojom:mojom_webui_js" ]
+ sources = [ "$root_gen_dir/mojom-webui/chromeos/ash/components/audio/public/mojom/cros_audio_config.mojom-webui.js" ]
outputs = [ "$target_gen_dir/$preprocessed_ts_folder/mojom-webui/audio/{{source_file_part}}" ]
}
diff --git a/chrome/browser/resources/settings/chromeos/device_page/BUILD.gn b/chrome/browser/resources/settings/chromeos/device_page/BUILD.gn
index 86d9f23..84cf42a 100644
--- a/chrome/browser/resources/settings/chromeos/device_page/BUILD.gn
+++ b/chrome/browser/resources/settings/chromeos/device_page/BUILD.gn
@@ -36,7 +36,7 @@
"..:os_route",
"..:route_observer_behavior",
"../..:router",
- "//ash/components/audio/public/mojom:mojom_webui_js",
+ "//chromeos/ash/components/audio/public/mojom:mojom_webui_js",
"//ui/webui/resources/js:i18n_behavior.m",
]
@@ -45,7 +45,7 @@
}
js_library("cros_audio_config") {
- deps = [ "//ash/components/audio/public/mojom:mojom_webui_js" ]
+ deps = [ "//chromeos/ash/components/audio/public/mojom:mojom_webui_js" ]
}
js_library("device_page") {
diff --git a/chrome/browser/resources/settings/chromeos/os_settings.gni b/chrome/browser/resources/settings/chromeos/os_settings.gni
index e9a0d7b..85adb10 100644
--- a/chrome/browser/resources/settings/chromeos/os_settings.gni
+++ b/chrome/browser/resources/settings/chromeos/os_settings.gni
@@ -375,9 +375,9 @@
root_build_dir),
"browser_resolver_prefix_replacements=\"../../mojom-webui/personalization/=../../\"",
"browser_resolver_prefix_replacements=\"../mojom-webui/personalization/=../\"",
- "js_module_root=" +
- rebase_path("$root_gen_dir/mojom-webui/ash/components/audio/public/mojom",
- root_build_dir),
+ "js_module_root=" + rebase_path(
+ "$root_gen_dir/mojom-webui/chromeos/ash/components/audio/public/mojom",
+ root_build_dir),
"browser_resolver_prefix_replacements=\"../../mojom-webui/audio/=../../\"",
"browser_resolver_prefix_replacements=\"../mojom-webui/audio/=../\"",
]
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 41785c28..a018c1b5 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -3045,7 +3045,6 @@
"//ash/assistant/util",
"//ash/components/arc",
"//ash/components/arc/video_accelerator:protected_native_pixmap_query_client",
- "//ash/components/audio",
"//ash/components/cryptohome",
"//ash/components/disks",
"//ash/components/drivefs",
@@ -3160,6 +3159,7 @@
"//chrome/services/file_util/public/cpp",
"//chromeos/ash/components/account_manager",
"//chromeos/ash/components/assistant:buildflags",
+ "//chromeos/ash/components/audio",
"//chromeos/ash/components/dbus/audio",
"//chromeos/ash/components/dbus/cryptohome",
"//chromeos/ash/components/dbus/cryptohome:cryptohome_proto",
diff --git a/chrome/browser/ui/ash/accessibility/accessibility_controller_client.cc b/chrome/browser/ui/ash/accessibility/accessibility_controller_client.cc
index 0ae25ff1..2888f702 100644
--- a/chrome/browser/ui/ash/accessibility/accessibility_controller_client.cc
+++ b/chrome/browser/ui/ash/accessibility/accessibility_controller_client.cc
@@ -4,13 +4,13 @@
#include "chrome/browser/ui/ash/accessibility/accessibility_controller_client.h"
-#include "ash/components/audio/sounds.h"
#include "ash/public/cpp/accessibility_controller.h"
#include "ash/public/cpp/accessibility_controller_enums.h"
#include "chrome/browser/ash/accessibility/accessibility_manager.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h"
#include "chrome/grit/generated_resources.h"
+#include "chromeos/ash/components/audio/sounds.h"
#include "content/public/browser/tts_controller.h"
#include "ui/aura/window.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/ui/ash/accessibility/accessibility_controller_client_unittest.cc b/chrome/browser/ui/ash/accessibility/accessibility_controller_client_unittest.cc
index 49ef66f..a75a3f3 100644
--- a/chrome/browser/ui/ash/accessibility/accessibility_controller_client_unittest.cc
+++ b/chrome/browser/ui/ash/accessibility/accessibility_controller_client_unittest.cc
@@ -4,10 +4,10 @@
#include "chrome/browser/ui/ash/accessibility/accessibility_controller_client.h"
-#include "ash/components/audio/sounds.h"
#include "ash/public/cpp/accessibility_controller_enums.h"
#include "base/time/time.h"
#include "chrome/browser/ui/ash/accessibility/fake_accessibility_controller.h"
+#include "chromeos/ash/components/audio/sounds.h"
#include "content/public/test/browser_task_environment.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/ui/ash/assistant/assistant_browsertest.cc b/chrome/browser/ui/ash/assistant/assistant_browsertest.cc
index 134d585..981cd15f 100644
--- a/chrome/browser/ui/ash/assistant/assistant_browsertest.cc
+++ b/chrome/browser/ui/ash/assistant/assistant_browsertest.cc
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/components/audio/cras_audio_handler.h"
#include "ash/constants/ash_features.h"
#include "ash/public/cpp/test/app_list_test_api.h"
#include "base/command_line.h"
@@ -15,6 +14,7 @@
#include "chrome/browser/ui/ash/assistant/assistant_test_mixin.h"
#include "chrome/test/base/mixin_based_in_process_browser_test.h"
#include "chromeos/ash/components/assistant/test_support/expect_utils.h"
+#include "chromeos/ash/components/audio/cras_audio_handler.h"
#include "chromeos/ash/services/assistant/public/cpp/features.h"
#include "chromeos/ash/services/assistant/public/cpp/switches.h"
#include "chromeos/ash/services/assistant/service.h"
diff --git a/chrome/browser/ui/ash/volume_controller_browsertest.cc b/chrome/browser/ui/ash/volume_controller_browsertest.cc
index 592816c..5b5abb4 100644
--- a/chrome/browser/ui/ash/volume_controller_browsertest.cc
+++ b/chrome/browser/ui/ash/volume_controller_browsertest.cc
@@ -5,14 +5,14 @@
#include <map>
#include <memory>
-#include "ash/components/audio/cras_audio_handler.h"
-#include "ash/components/audio/sounds.h"
#include "ash/constants/ash_switches.h"
#include "ash/shell.h"
#include "base/command_line.h"
#include "chrome/browser/ash/accessibility/accessibility_manager.h"
#include "chrome/browser/browser_process.h"
#include "chrome/test/base/in_process_browser_test.h"
+#include "chromeos/ash/components/audio/cras_audio_handler.h"
+#include "chromeos/ash/components/audio/sounds.h"
#include "content/public/test/browser_test.h"
#include "services/audio/public/cpp/sounds/sounds_manager.h"
#include "ui/base/accelerators/accelerator.h"
diff --git a/chrome/browser/ui/webui/DEPS b/chrome/browser/ui/webui/DEPS
index efbf8567..e40bda8b 100644
--- a/chrome/browser/ui/webui/DEPS
+++ b/chrome/browser/ui/webui/DEPS
@@ -1,19 +1,6 @@
include_rules = [
- "+ash/components/audio",
- "+ash/webui/os_feedback_ui",
- "+components/app_constants",
"+components/browser_ui/share/android",
- "+components/services/app_service/public",
- "+device/bluetooth",
"+extensions/strings/grit/extensions_strings.h",
-
- # Generated files
- "+js2webui/chrome/test/data",
-
- # Other libraries.
- "+third_party/angle", # For ANGLE version.
- "+third_party/brotli", # For compressed resources.
- "+third_party/zlib/zlib.h", # For compression level constants.
]
specific_include_rules = {
diff --git a/chrome/browser/ui/webui/chromeos/assistant_optin/assistant_optin_utils.cc b/chrome/browser/ui/webui/chromeos/assistant_optin/assistant_optin_utils.cc
index e88bb8b..f9351baa 100644
--- a/chrome/browser/ui/webui/chromeos/assistant_optin/assistant_optin_utils.cc
+++ b/chrome/browser/ui/webui/chromeos/assistant_optin/assistant_optin_utils.cc
@@ -7,7 +7,6 @@
#include <utility>
#include "ash/components/arc/arc_prefs.h"
-#include "ash/components/audio/cras_audio_handler.h"
#include "ash/constants/ash_features.h"
#include "base/containers/contains.h"
#include "base/metrics/histogram_macros.h"
@@ -16,6 +15,7 @@
#include "chrome/browser/signin/identity_manager_factory.h"
#include "chrome/grit/browser_resources.h"
#include "chrome/grit/generated_resources.h"
+#include "chromeos/ash/components/audio/cras_audio_handler.h"
#include "chromeos/ash/services/assistant/public/cpp/assistant_prefs.h"
#include "chromeos/ash/services/assistant/public/cpp/features.h"
#include "chromeos/ash/services/assistant/public/proto/activity_control_settings_common.pb.h"
diff --git a/chrome/browser/ui/webui/chromeos/audio/audio_handler.h b/chrome/browser/ui/webui/chromeos/audio/audio_handler.h
index de86c5e..732d02d 100644
--- a/chrome/browser/ui/webui/chromeos/audio/audio_handler.h
+++ b/chrome/browser/ui/webui/chromeos/audio/audio_handler.h
@@ -7,10 +7,10 @@
#include <tuple>
-#include "ash/components/audio/audio_device.h"
-#include "ash/components/audio/cras_audio_handler.h"
#include "base/scoped_observation.h"
#include "chrome/browser/ui/webui/chromeos/audio/audio.mojom.h"
+#include "chromeos/ash/components/audio/audio_device.h"
+#include "chromeos/ash/components/audio/cras_audio_handler.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/receiver.h"
diff --git a/chrome/browser/ui/webui/settings/chromeos/BUILD.gn b/chrome/browser/ui/webui/settings/chromeos/BUILD.gn
index b20c3183..ac5590a 100644
--- a/chrome/browser/ui/webui/settings/chromeos/BUILD.gn
+++ b/chrome/browser/ui/webui/settings/chromeos/BUILD.gn
@@ -5,9 +5,9 @@
group("mojom_js") {
public_deps = [
"constants:mojom_js",
- "//ash/components/audio/public/mojom/:mojom_js",
"//chrome/browser/ui/webui/nearby_share/public/mojom:mojom_js",
"//chrome/browser/ui/webui/settings/ash/search:mojo_bindings_js",
+ "//chromeos/ash/components/audio/public/mojom/:mojom_js",
"//ui/webui/resources/cr_components/app_management:mojo_bindings_js",
]
}
diff --git a/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc b/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc
index 43707db..3837a29 100644
--- a/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc
@@ -7,7 +7,6 @@
#include <memory>
#include <utility>
-#include "ash/components/audio/sounds.h"
#include "base/base64.h"
#include "base/bind.h"
#include "base/callback_helpers.h"
@@ -36,6 +35,7 @@
#include "chrome/common/url_constants.h"
#include "chrome/grit/browser_resources.h"
#include "chrome/grit/generated_resources.h"
+#include "chromeos/ash/components/audio/sounds.h"
#include "components/user_manager/user.h"
#include "components/user_manager/user_image/user_image.h"
#include "components/user_manager/user_manager.h"
diff --git a/chrome/browser/ui/webui/settings/chromeos/google_assistant_handler.cc b/chrome/browser/ui/webui/settings/chromeos/google_assistant_handler.cc
index b2b874f..7cd42cf 100644
--- a/chrome/browser/ui/webui/settings/chromeos/google_assistant_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/google_assistant_handler.cc
@@ -8,13 +8,13 @@
#include "ash/components/arc/arc_prefs.h"
#include "ash/components/arc/session/arc_service_manager.h"
-#include "ash/components/audio/cras_audio_handler.h"
#include "ash/public/cpp/assistant/assistant_setup.h"
#include "ash/public/cpp/assistant/controller/assistant_controller.h"
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/values.h"
#include "chrome/browser/ui/webui/chromeos/assistant_optin/assistant_optin_ui.h"
+#include "chromeos/ash/components/audio/cras_audio_handler.h"
#include "chromeos/ash/services/assistant/public/cpp/assistant_service.h"
#include "content/public/browser/browser_context.h"
#include "ui/gfx/geometry/rect.h"
diff --git a/chrome/browser/ui/webui/settings/chromeos/google_assistant_handler.h b/chrome/browser/ui/webui/settings/chromeos/google_assistant_handler.h
index 551441c..002db57 100644
--- a/chrome/browser/ui/webui/settings/chromeos/google_assistant_handler.h
+++ b/chrome/browser/ui/webui/settings/chromeos/google_assistant_handler.h
@@ -5,8 +5,8 @@
#ifndef CHROME_BROWSER_UI_WEBUI_SETTINGS_CHROMEOS_GOOGLE_ASSISTANT_HANDLER_H_
#define CHROME_BROWSER_UI_WEBUI_SETTINGS_CHROMEOS_GOOGLE_ASSISTANT_HANDLER_H_
-#include "ash/components/audio/cras_audio_handler.h"
#include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"
+#include "chromeos/ash/components/audio/cras_audio_handler.h"
#include "mojo/public/cpp/bindings/remote.h"
namespace chromeos {
diff --git a/chrome/browser/ui/webui/settings/chromeos/os_settings_ui.h b/chrome/browser/ui/webui/settings/chromeos/os_settings_ui.h
index 7afd6b32..95af151 100644
--- a/chrome/browser/ui/webui/settings/chromeos/os_settings_ui.h
+++ b/chrome/browser/ui/webui/settings/chromeos/os_settings_ui.h
@@ -7,7 +7,6 @@
#include <memory>
-#include "ash/components/audio/public/mojom/cros_audio_config.mojom-forward.h"
#include "ash/services/cellular_setup/public/mojom/cellular_setup.mojom-forward.h"
#include "ash/services/cellular_setup/public/mojom/esim_manager.mojom-forward.h"
#include "ash/webui/personalization_app/search/search.mojom-forward.h"
@@ -19,6 +18,7 @@
#include "chrome/browser/ui/webui/settings/ash/os_apps_page/mojom/app_notification_handler.mojom-forward.h"
#include "chrome/browser/ui/webui/settings/ash/search/user_action_recorder.mojom-forward.h"
#include "chrome/browser/ui/webui/webui_load_timer.h"
+#include "chromeos/ash/components/audio/public/mojom/cros_audio_config.mojom-forward.h"
#include "chromeos/ash/services/auth_factor_config/public/mojom/auth_factor_config.mojom-forward.h"
#include "chromeos/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-forward.h"
#include "chromeos/services/network_config/public/mojom/cros_network_config.mojom-forward.h"
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index c446d79..e5a8ecde 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -4111,7 +4111,6 @@
"//ash/components/arc:prefs",
"//ash/components/arc/enterprise",
"//ash/components/arc/session:arc_base_enums",
- "//ash/components/audio",
"//ash/components/cryptohome",
"//ash/components/disks",
"//ash/components/disks:test_support",
@@ -4182,6 +4181,7 @@
"//chromeos/ash/components/assistant:buildflags",
"//chromeos/ash/components/attestation",
"//chromeos/ash/components/attestation:test_support",
+ "//chromeos/ash/components/audio",
"//chromeos/ash/components/dbus:test_support",
"//chromeos/ash/components/dbus/attestation",
"//chromeos/ash/components/dbus/attestation:attestation_proto",
@@ -7312,7 +7312,6 @@
"//ash/assistant/util",
"//ash/components/arc",
"//ash/components/arc:arc_test_support",
- "//ash/components/audio",
"//ash/components/cryptohome",
"//ash/components/disks",
"//ash/components/disks:test_support",
@@ -7386,6 +7385,7 @@
"//chrome/services/sharing/public/cpp",
"//chrome/services/sharing/public/cpp:unit_tests",
"//chromeos/ash/components/assistant:buildflags",
+ "//chromeos/ash/components/audio",
"//chromeos/ash/components/dbus/attestation",
"//chromeos/ash/components/dbus/cicerone",
"//chromeos/ash/components/dbus/concierge",
diff --git a/chrome/test/data/webui/settings/chromeos/BUILD.gn b/chrome/test/data/webui/settings/chromeos/BUILD.gn
index 2891ac9b..afb906e 100644
--- a/chrome/test/data/webui/settings/chromeos/BUILD.gn
+++ b/chrome/test/data/webui/settings/chromeos/BUILD.gn
@@ -27,5 +27,7 @@
}
js_library("fake_cros_audio_config") {
- deps = [ "//ash/components/audio/public/mojom:mojom_js_library_for_compile" ]
+ deps = [
+ "//chromeos/ash/components/audio/public/mojom:mojom_js_library_for_compile",
+ ]
}
