Move //chromeos/audio to //ash/components/audio
This CL is part of the Chrome OS source code directory migration:
https://docs.google.com/document/d/15plIji-k6nMB19KJdNHLsK9jqBer_x-5O6MfTFZ8Fdo.
Bug: 1164001
Change-Id: Ieb0b8c916cea49672559f789469c479029669c6e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2620803
Commit-Queue: Henrique Ferreiro <[email protected]>
Owners-Override: Henrique Ferreiro <[email protected]>
Reviewed-by: James Cook <[email protected]>
Cr-Commit-Position: refs/heads/master@{#855493}
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 617acff..148593f 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2406,6 +2406,7 @@
"apps/digital_goods/util.h",
]
deps += [
+ "//ash/components/audio",
"//ash/constants",
"//chrome/app/theme:chrome_unscaled_resources_grit",
"//chrome/browser/nearby_sharing/common",
@@ -2415,7 +2416,6 @@
"//chrome/browser/ui/webui/chromeos/machine_learning:mojo_bindings",
"//chrome/browser/ui/webui/settings/chromeos/constants:mojom",
"//chrome/browser/ui/webui/settings/chromeos/search:mojo_bindings",
- "//chromeos/audio",
"//chromeos/components/camera_app_ui",
"//chromeos/components/camera_app_ui:mojo_bindings",
"//chromeos/components/chromebox_for_meetings/buildflags",
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index 6fdad1c..8d62355 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -407,12 +407,10 @@
"+chrome/services/speech",
# Code under //ash should be accessed via its public API. See //ash/README.md.
"-ash",
- "+ash/components",
"+ash/constants",
"+ash/public",
"+ash/keyboard/ui/grit",
"+ash/keyboard/ui/resources",
- "+ash/components/shortcut_viewer",
# The message center should only be accessed through
# //chrome/browser/notifications.
@@ -511,6 +509,9 @@
"browser_process_impl.cc": [
"+ui/message_center/message_center.h",
],
+ "browser_process_platform_part_chromeos.cc": [
+ "+ash/components/account_manager",
+ ],
"input_method_engine.cc": [
# For GetVirtualKeyboardController.
"+ash/keyboard/ui/keyboard_ui_controller.h",
diff --git a/chrome/browser/ash/accessibility/accessibility_manager.cc b/chrome/browser/ash/accessibility/accessibility_manager.cc
index 9333063f..c771b40 100644
--- a/chrome/browser/ash/accessibility/accessibility_manager.cc
+++ b/chrome/browser/ash/accessibility/accessibility_manager.cc
@@ -11,6 +11,7 @@
#include <utility>
#include <vector>
+#include "ash/components/audio/sounds.h"
#include "ash/constants/ash_switches.h"
#include "ash/public/cpp/accelerators.h"
#include "ash/public/cpp/accessibility_controller.h"
@@ -59,7 +60,6 @@
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
#include "chrome/grit/browser_resources.h"
-#include "chromeos/audio/chromeos_sounds.h"
#include "chromeos/dbus/power/power_manager_client.h"
#include "chromeos/dbus/upstart/upstart_client.h"
#include "components/language/core/browser/pref_names.h"
diff --git a/chrome/browser/ash/accessibility/accessibility_manager.h b/chrome/browser/ash/accessibility/accessibility_manager.h
index 377a7655..7633e22 100644
--- a/chrome/browser/ash/accessibility/accessibility_manager.h
+++ b/chrome/browser/ash/accessibility/accessibility_manager.h
@@ -11,6 +11,8 @@
#include <string>
#include <vector>
+#include "ash/components/audio/cras_audio_handler.h"
+#include "ash/components/audio/sounds.h"
#include "base/callback_forward.h"
#include "base/callback_list.h"
#include "base/macros.h"
@@ -21,8 +23,6 @@
#include "chrome/browser/extensions/api/braille_display_private/braille_controller.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_observer.h"
-#include "chromeos/audio/chromeos_sounds.h"
-#include "chromeos/audio/cras_audio_handler.h"
#include "components/prefs/pref_change_registrar.h"
#include "components/user_manager/user_manager.h"
#include "content/public/browser/notification_observer.h"
@@ -260,7 +260,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
- // chromeos/audio/chromeos_sounds.h.
+ // ash/components/audio/sounds.h.
bool PlayEarcon(ash::Sound sound_key, PlaySoundOption option);
// Forward an accessibility gesture from the touch exploration controller
diff --git a/chrome/browser/ash/accessibility/dictation.cc b/chrome/browser/ash/accessibility/dictation.cc
index 6aab5c9..0a4c73d 100644
--- a/chrome/browser/ash/accessibility/dictation.cc
+++ b/chrome/browser/ash/accessibility/dictation.cc
@@ -4,12 +4,12 @@
#include "chrome/browser/ash/accessibility/dictation.h"
+#include "ash/components/audio/sounds.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/ash/accessibility/accessibility_manager.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/speech/speech_recognizer.h"
#include "chrome/common/pref_names.h"
-#include "chromeos/audio/chromeos_sounds.h"
#include "components/language/core/browser/pref_names.h"
#include "components/prefs/pref_service.h"
#include "content/public/browser/storage_partition.h"
diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn
index f6e5a82f..92a521e 100644
--- a/chrome/browser/chromeos/BUILD.gn
+++ b/chrome/browser/chromeos/BUILD.gn
@@ -72,6 +72,7 @@
"//apps",
"//ash",
"//ash/components/account_manager",
+ "//ash/components/audio",
"//ash/constants",
"//ash/public/cpp",
"//ash/public/cpp/external_arc",
@@ -116,7 +117,6 @@
"//chromeos",
"//chromeos/assistant:buildflags",
"//chromeos/attestation",
- "//chromeos/audio",
"//chromeos/components/camera_app_ui",
"//chromeos/components/cdm_factory_daemon:cdm_factory_daemon_browser",
"//chromeos/components/chromebox_for_meetings/buildflags",
@@ -4146,6 +4146,7 @@
":test_support",
":user_activity_event_proto",
"//ash",
+ "//ash/components/audio",
"//ash/constants",
"//ash/public/cpp:test_support",
"//ash/public/cpp/external_arc",
@@ -4165,7 +4166,6 @@
"//chrome/test:test_support_unit",
"//chromeos",
"//chromeos/attestation:test_support",
- "//chromeos/audio",
"//chromeos/components/multidevice:test_support",
"//chromeos/components/phonehub:test_support",
"//chromeos/components/proximity_auth",
diff --git a/chrome/browser/chromeos/DEPS b/chrome/browser/chromeos/DEPS
index 43e516d5..31d3143e 100644
--- a/chrome/browser/chromeos/DEPS
+++ b/chrome/browser/chromeos/DEPS
@@ -1,4 +1,6 @@
include_rules = [
+ "+ash/components/account_manager",
+ "+ash/components/audio",
"+chrome/browser/image_decoder",
# TODO(ananta): Remove this when we move files which display UI in
# chrome/browser/chromeos to chrome/browser/ui/views/chromeos
@@ -32,6 +34,7 @@
],
".*test.*": [
"!ash",
+ "+ash/components/audio",
"+ash/constants",
"+ash/public",
],
diff --git a/chrome/browser/chromeos/camera_mic/vm_camera_mic_manager.h b/chrome/browser/chromeos/camera_mic/vm_camera_mic_manager.h
index 30572d9..a426b1ff 100644
--- a/chrome/browser/chromeos/camera_mic/vm_camera_mic_manager.h
+++ b/chrome/browser/chromeos/camera_mic/vm_camera_mic_manager.h
@@ -8,13 +8,13 @@
#include <bitset>
#include <memory>
+#include "ash/components/audio/cras_audio_handler.h"
#include "base/callback_forward.h"
#include "base/containers/flat_map.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/audio/cras_audio_handler.h"
#include "components/keyed_service/core/keyed_service.h"
#include "media/capture/video/chromeos/ash/camera_hal_dispatcher_impl.h"
#include "ui/message_center/public/cpp/notification.h"
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 7a48678..dc9d9821 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -10,6 +10,8 @@
#include <utility>
#include <vector>
+#include "ash/components/audio/audio_devices_pref_handler_impl.h"
+#include "ash/components/audio/cras_audio_handler.h"
#include "ash/constants/ash_features.h"
#include "ash/constants/ash_switches.h"
#include "ash/keyboard/ui/resources/keyboard_resource_util.h"
@@ -147,8 +149,6 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/logging_chrome.h"
#include "chrome/common/pref_names.h"
-#include "chromeos/audio/audio_devices_pref_handler_impl.h"
-#include "chromeos/audio/cras_audio_handler.h"
#include "chromeos/components/chromebox_for_meetings/buildflags/buildflags.h" // PLATFORM_CFM
#include "chromeos/components/drivefs/fake_drivefs_launcher_client.h"
#include "chromeos/components/local_search_service/public/cpp/local_search_service_proxy_factory.h"
diff --git a/chrome/browser/chromeos/login/lock/screen_locker.cc b/chrome/browser/chromeos/login/lock/screen_locker.cc
index 56ecaaa..8ce03dc 100644
--- a/chrome/browser/chromeos/login/lock/screen_locker.cc
+++ b/chrome/browser/chromeos/login/lock/screen_locker.cc
@@ -6,6 +6,7 @@
#include <algorithm>
+#include "ash/components/audio/sounds.h"
#include "ash/public/cpp/ash_switches.h"
#include "ash/public/cpp/login_screen.h"
#include "ash/public/cpp/login_screen_model.h"
@@ -50,7 +51,6 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/grit/browser_resources.h"
#include "chrome/grit/generated_resources.h"
-#include "chromeos/audio/chromeos_sounds.h"
#include "chromeos/dbus/biod/constants.pb.h"
#include "chromeos/dbus/session_manager/session_manager_client.h"
#include "chromeos/login/auth/authenticator.h"
diff --git a/chrome/browser/chromeos/login/lock/screen_locker_unittest.cc b/chrome/browser/chromeos/login/lock/screen_locker_unittest.cc
index c2d65b74..981a8d26 100644
--- a/chrome/browser/chromeos/login/lock/screen_locker_unittest.cc
+++ b/chrome/browser/chromeos/login/lock/screen_locker_unittest.cc
@@ -6,6 +6,7 @@
#include <memory>
+#include "ash/components/audio/cras_audio_handler.h"
#include "ash/public/cpp/login_screen_model.h"
#include "ash/public/cpp/login_types.h"
#include "base/bind.h"
@@ -30,7 +31,6 @@
#include "chrome/common/chrome_constants.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile_manager.h"
-#include "chromeos/audio/cras_audio_handler.h"
#include "chromeos/cryptohome/system_salt_getter.h"
#include "chromeos/dbus/audio/cras_audio_client.h"
#include "chromeos/dbus/biod/biod_client.h"
diff --git a/chrome/browser/chromeos/login/ui/login_display_host_webui.cc b/chrome/browser/chromeos/login/ui/login_display_host_webui.cc
index 44b43c5..2cc4781 100644
--- a/chrome/browser/chromeos/login/ui/login_display_host_webui.cc
+++ b/chrome/browser/chromeos/login/ui/login_display_host_webui.cc
@@ -8,6 +8,7 @@
#include <vector>
#include "ash/accessibility/focus_ring_controller.h"
+#include "ash/components/audio/sounds.h"
#include "ash/constants/ash_switches.h"
#include "ash/public/cpp/locale_update_controller.h"
#include "ash/public/cpp/login_screen.h"
@@ -76,7 +77,6 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/grit/browser_resources.h"
-#include "chromeos/audio/chromeos_sounds.h"
#include "chromeos/dbus/session_manager/session_manager_client.h"
#include "chromeos/login/login_state/login_state.h"
#include "chromeos/settings/cros_settings_names.h"
diff --git a/chrome/browser/chromeos/login/ui/login_display_host_webui.h b/chrome/browser/chromeos/login/ui/login_display_host_webui.h
index 7804f50..d6f761c4f 100644
--- a/chrome/browser/chromeos/login/ui/login_display_host_webui.h
+++ b/chrome/browser/chromeos/login/ui/login_display_host_webui.h
@@ -11,6 +11,7 @@
#include <string>
#include <vector>
+#include "ash/components/audio/cras_audio_handler.h"
#include "ash/public/cpp/multi_user_window_manager_observer.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
@@ -23,7 +24,6 @@
#include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chrome/browser/chromeos/settings/device_settings_service.h"
#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_helper.h"
-#include "chromeos/audio/cras_audio_handler.h"
#include "chromeos/dbus/session_manager/session_manager_client.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index 0b4cdff1..c25137b 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -14,6 +14,7 @@
#include <utility>
#include <vector>
+#include "ash/components/audio/cras_audio_handler.h"
#include "ash/constants/ash_switches.h"
#include "ash/constants/devicetype.h"
#include "ash/public/cpp/ash_switches.h"
@@ -162,7 +163,6 @@
#include "chrome/browser/ui/webui/help/help_utils_chromeos.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/pref_names.h"
-#include "chromeos/audio/cras_audio_handler.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/session_manager/session_manager_client.h"
#include "chromeos/geolocation/simple_geolocation_provider.h"
diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
index 1772fd3..47c8e3f7 100644
--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/chromeos/login/wizard_controller.h"
+#include "ash/components/audio/cras_audio_handler.h"
#include "ash/constants/ash_switches.h"
#include "ash/public/cpp/login_screen_test_api.h"
#include "base/bind.h"
@@ -75,7 +76,6 @@
#include "chrome/common/pref_names.h"
#include "chrome/grit/generated_resources.h"
#include "chrome/test/base/testing_profile.h"
-#include "chromeos/audio/cras_audio_handler.h"
#include "chromeos/dbus/constants/dbus_switches.h"
#include "chromeos/dbus/cryptohome/fake_cryptohome_client.h"
#include "chromeos/dbus/dbus_thread_manager.h"
diff --git a/chrome/browser/chromeos/policy/remote_commands/device_command_set_volume_job.cc b/chrome/browser/chromeos/policy/remote_commands/device_command_set_volume_job.cc
index 8f09fec7..2295403 100644
--- a/chrome/browser/chromeos/policy/remote_commands/device_command_set_volume_job.cc
+++ b/chrome/browser/chromeos/policy/remote_commands/device_command_set_volume_job.cc
@@ -7,13 +7,13 @@
#include <memory>
#include <utility>
+#include "ash/components/audio/cras_audio_handler.h"
#include "base/bind.h"
#include "base/json/json_reader.h"
#include "base/optional.h"
#include "base/syslog_logging.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/values.h"
-#include "chromeos/audio/cras_audio_handler.h"
#include "components/policy/proto/device_management_backend.pb.h"
namespace policy {
diff --git a/chrome/browser/chromeos/policy/remote_commands/device_command_set_volume_job_unittest.cc b/chrome/browser/chromeos/policy/remote_commands/device_command_set_volume_job_unittest.cc
index 80b53e8..b1e4281 100644
--- a/chrome/browser/chromeos/policy/remote_commands/device_command_set_volume_job_unittest.cc
+++ b/chrome/browser/chromeos/policy/remote_commands/device_command_set_volume_job_unittest.cc
@@ -6,6 +6,7 @@
#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"
@@ -13,7 +14,6 @@
#include "base/run_loop.h"
#include "base/values.h"
#include "chrome/test/base/chrome_ash_test_base.h"
-#include "chromeos/audio/cras_audio_handler.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace policy {
diff --git a/chrome/browser/chromeos/policy/status_collector/device_status_collector.cc b/chrome/browser/chromeos/policy/status_collector/device_status_collector.cc
index 11c78d4..b778dad 100644
--- a/chrome/browser/chromeos/policy/status_collector/device_status_collector.cc
+++ b/chrome/browser/chromeos/policy/status_collector/device_status_collector.cc
@@ -17,6 +17,7 @@
#include <sstream>
#include <utility>
+#include "ash/components/audio/cras_audio_handler.h"
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/feature_list.h"
@@ -64,7 +65,6 @@
#include "chrome/common/channel_info.h"
#include "chrome/common/chrome_features.h"
#include "chrome/common/pref_names.h"
-#include "chromeos/audio/cras_audio_handler.h"
#include "chromeos/dbus/attestation/attestation_client.h"
#include "chromeos/dbus/cryptohome/cryptohome_client.h"
#include "chromeos/dbus/cryptohome/rpc.pb.h"
diff --git a/chrome/browser/chromeos/policy/status_collector/device_status_collector_browsertest.cc b/chrome/browser/chromeos/policy/status_collector/device_status_collector_browsertest.cc
index baa2bfe..215abee 100644
--- a/chrome/browser/chromeos/policy/status_collector/device_status_collector_browsertest.cc
+++ b/chrome/browser/chromeos/policy/status_collector/device_status_collector_browsertest.cc
@@ -13,6 +13,7 @@
#include <utility>
#include <vector>
+#include "ash/components/audio/cras_audio_handler.h"
#include "base/bind.h"
#include "base/environment.h"
#include "base/files/file_path.h"
@@ -56,7 +57,6 @@
#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/audio/cras_audio_handler.h"
#include "chromeos/dbus/attestation/attestation_client.h"
#include "chromeos/dbus/cros_disks_client.h"
#include "chromeos/dbus/cros_healthd/cros_healthd_client.h"
diff --git a/chrome/browser/policy/DEPS b/chrome/browser/policy/DEPS
index 65d1da9..4e3ae76 100644
--- a/chrome/browser/policy/DEPS
+++ b/chrome/browser/policy/DEPS
@@ -1,4 +1,7 @@
specific_include_rules = {
+ "audio_output_allowed_browsertest\.cc": [
+ "+ash/components/audio",
+ ],
"media_stream_policy_browsertest\.cc": [
"+components/webrtc",
],
diff --git a/chrome/browser/policy/audio_output_allowed_browsertest.cc b/chrome/browser/policy/audio_output_allowed_browsertest.cc
index 21c8fe7..b0b7a0e 100644
--- a/chrome/browser/policy/audio_output_allowed_browsertest.cc
+++ b/chrome/browser/policy/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/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 d5dd4a0b..3d650c4 100644
--- a/chrome/browser/prefs/DEPS
+++ b/chrome/browser/prefs/DEPS
@@ -1,6 +1,9 @@
include_rules = [
+ "+ash/components/account_manager",
+ "+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 82a9a90..5a4bc197 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -247,6 +247,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "ash/components/account_manager/account_manager.h"
+#include "ash/components/audio/audio_devices_pref_handler_impl.h"
#include "ash/public/cpp/ash_pref_names.h"
#include "ash/public/cpp/ash_prefs.h"
#include "chrome/browser/ash/app_mode/arc/arc_kiosk_app_manager.h"
@@ -341,7 +342,6 @@
#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/audio/audio_devices_pref_handler_impl.h"
#include "chromeos/components/local_search_service/search_metrics_reporter.h"
#include "chromeos/components/quick_answers/public/cpp/quick_answers_prefs.h"
#include "chromeos/network/cellular_esim_profile_handler_impl.h"
diff --git a/chrome/browser/profiles/DEPS b/chrome/browser/profiles/DEPS
index bf1e207..792624c 100644
--- a/chrome/browser/profiles/DEPS
+++ b/chrome/browser/profiles/DEPS
@@ -1,3 +1,7 @@
+include_rules = [
+ "+ash/components/account_manager",
+]
+
specific_include_rules = {
"chrome_browser_main_extra_parts_profiles.cc": [
# This is required to create the SiteDataCacheFacadeFactory when a profile
diff --git a/chrome/browser/signin/DEPS b/chrome/browser/signin/DEPS
new file mode 100644
index 0000000..e2cc84f
--- /dev/null
+++ b/chrome/browser/signin/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+ "+ash/components/account_manager",
+]
diff --git a/chrome/browser/sync/test/integration/DEPS b/chrome/browser/sync/test/integration/DEPS
new file mode 100644
index 0000000..e2cc84f
--- /dev/null
+++ b/chrome/browser/sync/test/integration/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+ "+ash/components/account_manager",
+]
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 96c5ef8..b6fbc90e 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -2622,6 +2622,7 @@
"//ash/assistant/model",
"//ash/assistant/util",
"//ash/components/account_manager",
+ "//ash/components/audio",
"//ash/constants",
"//ash/keyboard/ui",
"//ash/public/cpp",
@@ -2666,7 +2667,6 @@
"//chrome/services/file_util/public/cpp",
"//chromeos",
"//chromeos/assistant:buildflags",
- "//chromeos/audio",
"//chromeos/components/camera_app_ui",
"//chromeos/components/connectivity_diagnostics",
"//chromeos/components/diagnostics_ui",
diff --git a/chrome/browser/ui/ash/DEPS b/chrome/browser/ui/ash/DEPS
index e4113bb..0a2bef7e1 100644
--- a/chrome/browser/ui/ash/DEPS
+++ b/chrome/browser/ui/ash/DEPS
@@ -1,4 +1,5 @@
include_rules = [
+ "+ash/components/audio",
"+ash/keyboard/ui",
# ash depends on views, so code in ui/ash is allowed to depend on ui/views.
@@ -10,6 +11,7 @@
specific_include_rules = {
".*test.*": [
"!ash",
+ "+ash/components/audio",
"+ash/constants",
"+ash/shortcut_viewer",
"+ash/shortcut_viewer/strings/grit/shortcut_viewer_strings.h",
diff --git a/chrome/browser/ui/ash/accessibility/accessibility_controller_client.cc b/chrome/browser/ui/ash/accessibility/accessibility_controller_client.cc
index 80f05ba..8b3e0371 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/audio/chromeos_sounds.h"
#include "content/public/browser/tts_controller.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 83d067dd..fa4fbe3d1 100644
--- a/chrome/browser/ui/ash/accessibility/accessibility_controller_client_unittest.cc
+++ b/chrome/browser/ui/ash/accessibility/accessibility_controller_client_unittest.cc
@@ -4,12 +4,12 @@
#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/macros.h"
#include "base/optional.h"
#include "base/time/time.h"
#include "chrome/browser/ui/ash/accessibility/fake_accessibility_controller.h"
-#include "chromeos/audio/chromeos_sounds.h"
#include "content/public/test/browser_task_environment.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/accessibility/ax_enums.mojom.h"
diff --git a/chrome/browser/ui/ash/assistant/assistant_browsertest.cc b/chrome/browser/ui/ash/assistant/assistant_browsertest.cc
index a45ae75..9165af3 100644
--- a/chrome/browser/ui/ash/assistant/assistant_browsertest.cc
+++ b/chrome/browser/ui/ash/assistant/assistant_browsertest.cc
@@ -2,6 +2,7 @@
// 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/run_loop.h"
#include "base/test/bind.h"
#include "base/test/scoped_run_loop_timeout.h"
@@ -9,7 +10,6 @@
#include "chrome/browser/ui/ash/assistant/assistant_test_mixin.h"
#include "chrome/test/base/mixin_based_in_process_browser_test.h"
#include "chromeos/assistant/test_support/expect_utils.h"
-#include "chromeos/audio/cras_audio_handler.h"
#include "chromeos/dbus/power_manager/backlight.pb.h"
#include "chromeos/services/assistant/public/cpp/features.h"
#include "chromeos/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 9580b446..30d6c082 100644
--- a/chrome/browser/ui/ash/volume_controller_browsertest.cc
+++ b/chrome/browser/ui/ash/volume_controller_browsertest.cc
@@ -5,6 +5,8 @@
#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"
@@ -12,8 +14,6 @@
#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/audio/chromeos_sounds.h"
-#include "chromeos/audio/cras_audio_handler.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 35b8fd7..424b070 100644
--- a/chrome/browser/ui/webui/DEPS
+++ b/chrome/browser/ui/webui/DEPS
@@ -1,4 +1,6 @@
include_rules = [
+ "+ash/components/account_manager",
+ "+ash/components/audio",
"+components/services/app_service/public",
"+device/bluetooth",
"+extensions/strings/grit/extensions_strings.h",
@@ -10,4 +12,4 @@
"+third_party/angle", # For ANGLE version.
"+third_party/brotli", # For compressed resources.
"+third_party/zlib/zlib.h", # For compression level constants.
-]
\ No newline at end of file
+]
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 861f8c8..8f40728 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
@@ -6,13 +6,13 @@
#include <utility>
+#include "ash/components/audio/cras_audio_handler.h"
#include "base/metrics/histogram_macros.h"
#include "chrome/browser/consent_auditor/consent_auditor_factory.h"
#include "chrome/browser/signin/identity_manager_factory.h"
#include "chrome/browser/ui/webui/chromeos/user_image_source.h"
#include "chrome/grit/browser_resources.h"
#include "chrome/grit/generated_resources.h"
-#include "chromeos/audio/cras_audio_handler.h"
#include "chromeos/services/assistant/public/cpp/assistant_prefs.h"
#include "chromeos/services/assistant/public/cpp/features.h"
#include "components/arc/arc_prefs.h"
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 c14b3563..e2e8687 100644
--- a/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc
@@ -7,6 +7,7 @@
#include <memory>
#include <utility>
+#include "ash/components/audio/sounds.h"
#include "base/base64.h"
#include "base/bind.h"
#include "base/callback_helpers.h"
@@ -34,7 +35,6 @@
#include "chrome/common/url_constants.h"
#include "chrome/grit/browser_resources.h"
#include "chrome/grit/generated_resources.h"
-#include "chromeos/audio/chromeos_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 cd178a4..b8202d9c 100644
--- a/chrome/browser/ui/webui/settings/chromeos/google_assistant_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/google_assistant_handler.cc
@@ -6,13 +6,13 @@
#include <utility>
+#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/audio/cras_audio_handler.h"
#include "chromeos/services/assistant/public/cpp/assistant_service.h"
#include "components/arc/arc_prefs.h"
#include "components/arc/arc_service_manager.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 5b96d4a..7e81a6d0 100644
--- a/chrome/browser/ui/webui/settings/chromeos/google_assistant_handler.h
+++ b/chrome/browser/ui/webui/settings/chromeos/google_assistant_handler.h
@@ -5,10 +5,10 @@
#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 "base/macros.h"
#include "base/optional.h"
#include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"
-#include "chromeos/audio/cras_audio_handler.h"
#include "mojo/public/cpp/bindings/remote.h"
namespace chromeos {
