BASELINE: Update Chromium to 112.0.5615.132

Change-Id: I59e23789618066826010171a36efbf8a68965ed0
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/472282
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 204 insertions, 86 deletions

diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn
index a760f726a62..9c8853f778f 100644
--- a/chromium/ash/BUILD.gn
+++ b/chromium/ash/BUILD.gn
@@ -26,6 +26,8 @@ assert(use_ozone)
 # GN "public" section. See README.md for notes on dependencies.
 component("ash") {
   sources = [
+    "accelerators/accelerator_alias_converter.cc",
+    "accelerators/accelerator_alias_converter.h",
     "accelerators/accelerator_commands.cc",
     "accelerators/accelerator_commands.h",
     "accelerators/accelerator_controller_impl.cc",
@@ -33,8 +35,6 @@ component("ash") {
     "accelerators/accelerator_history_impl.cc",
     "accelerators/accelerator_history_impl.h",
     "accelerators/accelerator_ids.h",
-    "accelerators/accelerator_layout_table.cc",
-    "accelerators/accelerator_layout_table.h",
     "accelerators/accelerator_notifications.cc",
     "accelerators/accelerator_notifications.h",
     "accelerators/accelerator_table.cc",
@@ -224,6 +224,8 @@ component("ash") {
     "ambient/ui/ambient_info_view.h",
     "ambient/ui/ambient_shield_view.cc",
     "ambient/ui/ambient_shield_view.h",
+    "ambient/ui/ambient_video_view.cc",
+    "ambient/ui/ambient_video_view.h",
     "ambient/ui/ambient_view_delegate.h",
     "ambient/ui/ambient_view_ids.h",
     "ambient/ui/glanceable_info_view.cc",
@@ -252,8 +254,6 @@ component("ash") {
     "assistant/assistant_notification_controller_impl.h",
     "assistant/assistant_notification_expiry_monitor.cc",
     "assistant/assistant_notification_expiry_monitor.h",
-    "assistant/assistant_screen_context_controller_impl.cc",
-    "assistant/assistant_screen_context_controller_impl.h",
     "assistant/assistant_setup_controller.cc",
     "assistant/assistant_setup_controller.h",
     "assistant/assistant_state_controller.cc",
@@ -401,6 +401,8 @@ component("ash") {
     "controls/scroll_view_gradient_helper.h",
     "curtain/input_event_filter.cc",
     "curtain/input_event_filter.h",
+    "curtain/remote_maintenance_curtain_view.cc",
+    "curtain/remote_maintenance_curtain_view.h",
     "curtain/security_curtain_controller.cc",
     "curtain/security_curtain_controller.h",
     "curtain/security_curtain_controller_impl.cc",
@@ -476,10 +478,6 @@ component("ash") {
     "display/output_protection_delegate.h",
     "display/overscan_calibrator.cc",
     "display/overscan_calibrator.h",
-    "display/persistent_window_controller.cc",
-    "display/persistent_window_controller.h",
-    "display/persistent_window_info.cc",
-    "display/persistent_window_info.h",
     "display/privacy_screen_controller.cc",
     "display/privacy_screen_controller.h",
     "display/projecting_observer.cc",
@@ -524,6 +522,8 @@ component("ash") {
     "events/accessibility_event_rewriter.h",
     "events/event_rewriter_controller_impl.cc",
     "events/event_rewriter_controller_impl.h",
+    "events/keyboard_capability_delegate_impl.cc",
+    "events/keyboard_capability_delegate_impl.h",
     "events/keyboard_driven_event_rewriter.cc",
     "events/keyboard_driven_event_rewriter.h",
     "events/select_to_speak_event_handler.cc",
@@ -546,6 +546,8 @@ component("ash") {
     "fast_ink/laser/laser_segment_utils.h",
     "fast_ink/view_tree_host_root_view.cc",
     "fast_ink/view_tree_host_root_view.h",
+    "fast_ink/view_tree_host_root_view_frame_factory.cc",
+    "fast_ink/view_tree_host_root_view_frame_factory.h",
     "fast_ink/view_tree_host_widget.cc",
     "fast_ink/view_tree_host_widget.h",
     "focus_cycler.cc",
@@ -558,6 +560,14 @@ component("ash") {
     "frame/snap_controller_impl.h",
     "frame/wide_frame_view.cc",
     "frame/wide_frame_view.h",
+    "frame_sink/frame_sink_holder.cc",
+    "frame_sink/frame_sink_holder.h",
+    "frame_sink/frame_sink_host.cc",
+    "frame_sink/frame_sink_host.h",
+    "frame_sink/ui_resource.cc",
+    "frame_sink/ui_resource.h",
+    "frame_sink/ui_resource_manager.cc",
+    "frame_sink/ui_resource_manager.h",
     "frame_throttler/frame_throttling_controller.cc",
     "frame_throttler/frame_throttling_controller.h",
     "frame_throttler/frame_throttling_observer.h",
@@ -582,14 +592,6 @@ component("ash") {
     "glanceables/glanceables_window_hider.h",
     "glanceables/signout_screenshot_handler.cc",
     "glanceables/signout_screenshot_handler.h",
-    "highlighter/highlighter_controller.cc",
-    "highlighter/highlighter_controller.h",
-    "highlighter/highlighter_gesture_util.cc",
-    "highlighter/highlighter_gesture_util.h",
-    "highlighter/highlighter_result_view.cc",
-    "highlighter/highlighter_result_view.h",
-    "highlighter/highlighter_view.cc",
-    "highlighter/highlighter_view.h",
     "host/ash_window_tree_host.cc",
     "host/ash_window_tree_host.h",
     "host/ash_window_tree_host_delegate.h",
@@ -834,6 +836,12 @@ component("ash") {
     "projector/ui/projector_button.h",
     "projector/ui/projector_color_button.cc",
     "projector/ui/projector_color_button.h",
+    "wm/multi_display/persistent_window_controller.cc",
+    "wm/multi_display/persistent_window_controller.h",
+    "wm/multi_display/persistent_window_info.cc",
+    "wm/multi_display/persistent_window_info.h",
+    "wm/multitask_menu_nudge_delegate_ash.cc",
+    "wm/multitask_menu_nudge_delegate_ash.h",
 
     # These headers declare functions that are implemented inside of //ash, so
     # they cannot live in //ash/public/cpp/BUILD.gn. The "test api" files are
@@ -877,6 +885,10 @@ component("ash") {
     "rotator/screen_rotation_animator_observer.h",
     "rotator/window_rotation.cc",
     "rotator/window_rotation.h",
+    "rounded_display/rounded_display_gutter.cc",
+    "rounded_display/rounded_display_gutter.h",
+    "rounded_display/rounded_display_gutter_factory.cc",
+    "rounded_display/rounded_display_gutter_factory.h",
     "scoped_animation_disabler.cc",
     "scoped_animation_disabler.h",
     "screen_util.cc",
@@ -1052,6 +1064,8 @@ component("ash") {
     "style/option_button_base.h",
     "style/option_button_group.cc",
     "style/option_button_group.h",
+    "style/pagination_view.cc",
+    "style/pagination_view.h",
     "style/pill_button.cc",
     "style/pill_button.h",
     "style/radio_button.cc",
@@ -1071,22 +1085,37 @@ component("ash") {
     "style/style_viewer/checkbox_instances_grid_view_factory.cc",
     "style/style_viewer/icon_button_instances_grid_view_factory.cc",
     "style/style_viewer/icon_switch_instances_grid_view_factory.cc",
+    "style/style_viewer/knob_switch_instances_grid_view_factory.cc",
+    "style/style_viewer/pagination_instances_grid_view_factory.cc",
     "style/style_viewer/pill_button_instances_grid_view_factory.cc",
     "style/style_viewer/radio_button_group_instances_grid_view_factory.cc",
     "style/style_viewer/radio_button_instances_grid_view_factory.cc",
+    "style/style_viewer/system_text_instances_grid_view_factory.cc",
     "style/style_viewer/system_ui_components_grid_view.cc",
     "style/style_viewer/system_ui_components_grid_view.h",
     "style/style_viewer/system_ui_components_grid_view_factories.h",
     "style/style_viewer/system_ui_components_style_viewer_view.cc",
     "style/style_viewer/system_ui_components_style_viewer_view.h",
+    "style/style_viewer/tab_slider_instances_grid_view_factory.cc",
+    "style/style_viewer/typography_instances_grid_view_factory.cc",
     "style/system_shadow.cc",
     "style/system_shadow.h",
     "style/system_shadow_on_nine_patch_layer.cc",
     "style/system_shadow_on_nine_patch_layer.h",
     "style/system_shadow_on_texture_layer.cc",
     "style/system_shadow_on_texture_layer.h",
+    "style/system_textfield.cc",
+    "style/system_textfield.h",
+    "style/system_textfield_controller.cc",
+    "style/system_textfield_controller.h",
     "style/system_toast_style.cc",
     "style/system_toast_style.h",
+    "style/tab_slider.cc",
+    "style/tab_slider.h",
+    "style/tab_slider_button.cc",
+    "style/tab_slider_button.h",
+    "style/typography.cc",
+    "style/typography.h",
     "system/accessibility/accessibility_detailed_view.cc",
     "system/accessibility/accessibility_detailed_view.h",
     "system/accessibility/accessibility_feature_disable_dialog.cc",
@@ -1143,6 +1172,8 @@ component("ash") {
     "system/accessibility/unified_accessibility_detailed_view_controller.h",
     "system/audio/audio_detailed_view.cc",
     "system/audio/audio_detailed_view.h",
+    "system/audio/audio_effects_controller.cc",
+    "system/audio/audio_effects_controller.h",
     "system/audio/display_speaker_controller.cc",
     "system/audio/display_speaker_controller.h",
     "system/audio/mic_gain_slider_controller.cc",
@@ -1183,6 +1214,10 @@ component("ash") {
     "system/bluetooth/bluetooth_notification_controller.h",
     "system/brightness/brightness_controller_chromeos.cc",
     "system/brightness/brightness_controller_chromeos.h",
+    "system/brightness/display_detailed_view.cc",
+    "system/brightness/display_detailed_view.h",
+    "system/brightness/quick_settings_display_detailed_view_controller.cc",
+    "system/brightness/quick_settings_display_detailed_view_controller.h",
     "system/brightness/unified_brightness_slider_controller.cc",
     "system/brightness/unified_brightness_slider_controller.h",
     "system/brightness/unified_brightness_view.cc",
@@ -1244,8 +1279,9 @@ component("ash") {
     "system/eche/eche_tray.cc",
     "system/eche/eche_tray.h",
     "system/enterprise/enterprise_domain_observer.h",
-    "system/federated/federated_service_controller.cc",
     "system/federated/federated_service_controller.h",
+    "system/federated/federated_service_controller_impl.cc",
+    "system/federated/federated_service_controller_impl.h",
     "system/firmware_update/firmware_update_notification_controller.cc",
     "system/firmware_update/firmware_update_notification_controller.h",
     "system/geolocation/geolocation_controller.cc",
@@ -1317,22 +1353,32 @@ component("ash") {
     "system/ime_menu/ime_list_view.h",
     "system/ime_menu/ime_menu_tray.cc",
     "system/ime_menu/ime_menu_tray.h",
-    "system/input_device_settings/initializers/input_device_tracker.h",
-    "system/input_device_settings/initializers/input_device_tracker_impl.cc",
-    "system/input_device_settings/initializers/input_device_tracker_impl.h",
-    "system/input_device_settings/initializers/keyboard_pref_initializer.cc",
-    "system/input_device_settings/initializers/keyboard_pref_initializer.h",
-    "system/input_device_settings/initializers/mouse_pref_initializer.cc",
-    "system/input_device_settings/initializers/mouse_pref_initializer.h",
-    "system/input_device_settings/initializers/pointing_stick_pref_initializer.cc",
-    "system/input_device_settings/initializers/pointing_stick_pref_initializer.h",
-    "system/input_device_settings/initializers/pref_initializer.h",
-    "system/input_device_settings/initializers/touchpad_pref_initializer.cc",
-    "system/input_device_settings/initializers/touchpad_pref_initializer.h",
-    "system/input_device_settings/input_device_pref_manager.cc",
-    "system/input_device_settings/input_device_pref_manager.h",
-    "system/input_device_settings/input_device_settings_controller.cc",
-    "system/input_device_settings/input_device_settings_controller.h",
+    "system/input_device_settings/input_device_notifier.cc",
+    "system/input_device_settings/input_device_notifier.h",
+    "system/input_device_settings/input_device_settings_controller_impl.cc",
+    "system/input_device_settings/input_device_settings_controller_impl.h",
+    "system/input_device_settings/input_device_settings_defaults.h",
+    "system/input_device_settings/input_device_settings_dispatcher.cc",
+    "system/input_device_settings/input_device_settings_dispatcher.h",
+    "system/input_device_settings/input_device_settings_pref_names.h",
+    "system/input_device_settings/input_device_settings_utils.cc",
+    "system/input_device_settings/input_device_settings_utils.h",
+    "system/input_device_settings/input_device_tracker.cc",
+    "system/input_device_settings/input_device_tracker.h",
+    "system/input_device_settings/keyboard_modifier_metrics_recorder.cc",
+    "system/input_device_settings/keyboard_modifier_metrics_recorder.h",
+    "system/input_device_settings/pref_handlers/keyboard_pref_handler.h",
+    "system/input_device_settings/pref_handlers/keyboard_pref_handler_impl.cc",
+    "system/input_device_settings/pref_handlers/keyboard_pref_handler_impl.h",
+    "system/input_device_settings/pref_handlers/mouse_pref_handler.h",
+    "system/input_device_settings/pref_handlers/mouse_pref_handler_impl.cc",
+    "system/input_device_settings/pref_handlers/mouse_pref_handler_impl.h",
+    "system/input_device_settings/pref_handlers/pointing_stick_pref_handler.h",
+    "system/input_device_settings/pref_handlers/pointing_stick_pref_handler_impl.cc",
+    "system/input_device_settings/pref_handlers/pointing_stick_pref_handler_impl.h",
+    "system/input_device_settings/pref_handlers/touchpad_pref_handler.h",
+    "system/input_device_settings/pref_handlers/touchpad_pref_handler_impl.cc",
+    "system/input_device_settings/pref_handlers/touchpad_pref_handler_impl.h",
     "system/keyboard_brightness/keyboard_backlight_color_controller.cc",
     "system/keyboard_brightness/keyboard_backlight_color_controller.h",
     "system/keyboard_brightness/keyboard_backlight_color_nudge_controller.cc",
@@ -1352,12 +1398,12 @@ component("ash") {
     "system/locale/locale_update_controller_impl.h",
     "system/locale/unified_locale_detailed_view_controller.cc",
     "system/locale/unified_locale_detailed_view_controller.h",
+    "system/lock_screen_notification_controller.cc",
+    "system/lock_screen_notification_controller.h",
     "system/machine_learning/user_settings_event_logger.cc",
     "system/machine_learning/user_settings_event_logger.h",
     "system/media/media_notification_provider.cc",
     "system/media/media_notification_provider.h",
-    "system/media/media_notification_provider_impl.cc",
-    "system/media/media_notification_provider_impl.h",
     "system/media/media_notification_provider_observer.h",
     "system/media/media_tray.cc",
     "system/media/media_tray.h",
@@ -1379,6 +1425,8 @@ component("ash") {
     "system/message_center/ash_message_popup_collection.h",
     "system/message_center/ash_notification_control_button_factory.cc",
     "system/message_center/ash_notification_control_button_factory.h",
+    "system/message_center/ash_notification_drag_controller.cc",
+    "system/message_center/ash_notification_drag_controller.h",
     "system/message_center/ash_notification_expand_button.cc",
     "system/message_center/ash_notification_expand_button.h",
     "system/message_center/ash_notification_input_container.cc",
@@ -1416,8 +1464,6 @@ component("ash") {
     "system/message_center/session_state_notification_blocker.h",
     "system/message_center/unified_message_center_bubble.cc",
     "system/message_center/unified_message_center_bubble.h",
-    "system/microphone_mute/microphone_mute_notification_controller.cc",
-    "system/microphone_mute/microphone_mute_notification_controller.h",
     "system/model/clock_model.cc",
     "system/model/clock_model.h",
     "system/model/clock_observer.h",
@@ -1467,19 +1513,15 @@ component("ash") {
     "system/network/network_detailed_view_controller.h",
     "system/network/network_feature_pod_button.cc",
     "system/network/network_feature_pod_button.h",
-    "system/network/network_feature_pod_button_legacy.cc",
-    "system/network/network_feature_pod_button_legacy.h",
     "system/network/network_feature_pod_controller.cc",
     "system/network/network_feature_pod_controller.h",
-    "system/network/network_feature_pod_controller_legacy.cc",
-    "system/network/network_feature_pod_controller_legacy.h",
+    "system/network/network_feature_tile.cc",
+    "system/network/network_feature_tile.h",
     "system/network/network_icon.cc",
     "system/network/network_icon.h",
     "system/network/network_icon_animation.cc",
     "system/network/network_icon_animation.h",
     "system/network/network_icon_animation_observer.h",
-    "system/network/network_info.cc",
-    "system/network/network_info.h",
     "system/network/network_info_bubble.cc",
     "system/network/network_info_bubble.h",
     "system/network/network_list_header_view.cc",
@@ -1494,8 +1536,6 @@ component("ash") {
     "system/network/network_list_network_header_view.h",
     "system/network/network_list_network_item_view.cc",
     "system/network/network_list_network_item_view.h",
-    "system/network/network_list_view.cc",
-    "system/network/network_list_view.h",
     "system/network/network_list_view_controller.cc",
     "system/network/network_list_view_controller.h",
     "system/network/network_list_view_controller_impl.cc",
@@ -1505,10 +1545,6 @@ component("ash") {
     "system/network/network_list_wifi_header_view_impl.cc",
     "system/network/network_list_wifi_header_view_impl.h",
     "system/network/network_observer.h",
-    "system/network/network_row_title_view.cc",
-    "system/network/network_row_title_view.h",
-    "system/network/network_section_header_view.cc",
-    "system/network/network_section_header_view.h",
     "system/network/network_state_list_detailed_view.cc",
     "system/network/network_state_list_detailed_view.h",
     "system/network/network_tray_view.cc",
@@ -1520,8 +1556,6 @@ component("ash") {
     "system/network/tray_network_state_model.cc",
     "system/network/tray_network_state_model.h",
     "system/network/tray_network_state_observer.h",
-    "system/network/unified_network_detailed_view_controller.cc",
-    "system/network/unified_network_detailed_view_controller.h",
     "system/network/unified_vpn_detailed_view_controller.cc",
     "system/network/unified_vpn_detailed_view_controller.h",
     "system/network/vpn_feature_pod_controller.cc",
@@ -1572,12 +1606,12 @@ component("ash") {
     "system/palette/tools/laser_pointer_mode.h",
     "system/palette/tools/magnifier_mode.cc",
     "system/palette/tools/magnifier_mode.h",
-    "system/palette/tools/metalayer_mode.cc",
-    "system/palette/tools/metalayer_mode.h",
     "system/pcie_peripheral/pcie_peripheral_notification_controller.cc",
     "system/pcie_peripheral/pcie_peripheral_notification_controller.h",
     "system/phonehub/app_stream_launcher_item.cc",
     "system/phonehub/app_stream_launcher_item.h",
+    "system/phonehub/app_stream_launcher_list_item.cc",
+    "system/phonehub/app_stream_launcher_list_item.h",
     "system/phonehub/app_stream_launcher_view.cc",
     "system/phonehub/app_stream_launcher_view.h",
     "system/phonehub/bluetooth_disabled_view.cc",
@@ -1592,6 +1626,8 @@ component("ash") {
     "system/phonehub/continue_browsing_chip.h",
     "system/phonehub/enable_hotspot_quick_action_controller.cc",
     "system/phonehub/enable_hotspot_quick_action_controller.h",
+    "system/phonehub/loading_indicator_view.cc",
+    "system/phonehub/loading_indicator_view.h",
     "system/phonehub/locate_phone_quick_action_controller.cc",
     "system/phonehub/locate_phone_quick_action_controller.h",
     "system/phonehub/multidevice_feature_opt_in_view.cc",
@@ -1604,18 +1640,30 @@ component("ash") {
     "system/phonehub/phone_connecting_view.h",
     "system/phonehub/phone_disconnected_view.cc",
     "system/phonehub/phone_disconnected_view.h",
+    "system/phonehub/phone_hub_app_count_icon.cc",
+    "system/phonehub/phone_hub_app_count_icon.h",
     "system/phonehub/phone_hub_content_view.cc",
     "system/phonehub/phone_hub_content_view.h",
     "system/phonehub/phone_hub_interstitial_view.cc",
     "system/phonehub/phone_hub_interstitial_view.h",
     "system/phonehub/phone_hub_metrics.cc",
     "system/phonehub/phone_hub_metrics.h",
+    "system/phonehub/phone_hub_more_apps_button.cc",
+    "system/phonehub/phone_hub_more_apps_button.h",
     "system/phonehub/phone_hub_notification_controller.cc",
     "system/phonehub/phone_hub_notification_controller.h",
+    "system/phonehub/phone_hub_nudge.cc",
+    "system/phonehub/phone_hub_nudge.h",
+    "system/phonehub/phone_hub_nudge_controller.cc",
+    "system/phonehub/phone_hub_nudge_controller.h",
     "system/phonehub/phone_hub_recent_app_button.cc",
     "system/phonehub/phone_hub_recent_app_button.h",
     "system/phonehub/phone_hub_recent_apps_view.cc",
     "system/phonehub/phone_hub_recent_apps_view.h",
+    "system/phonehub/phone_hub_small_app_icon.cc",
+    "system/phonehub/phone_hub_small_app_icon.h",
+    "system/phonehub/phone_hub_small_app_loading_icon.cc",
+    "system/phonehub/phone_hub_small_app_loading_icon.h",
     "system/phonehub/phone_hub_tray.cc",
     "system/phonehub/phone_hub_tray.h",
     "system/phonehub/phone_hub_ui_controller.cc",
@@ -1707,6 +1755,8 @@ component("ash") {
     "system/privacy_hub/privacy_hub_controller.h",
     "system/privacy_hub/privacy_hub_metrics.cc",
     "system/privacy_hub/privacy_hub_metrics.h",
+    "system/privacy_hub/privacy_hub_notification.cc",
+    "system/privacy_hub/privacy_hub_notification.h",
     "system/privacy_hub/privacy_hub_notification_controller.cc",
     "system/privacy_hub/privacy_hub_notification_controller.h",
     "system/privacy_screen/privacy_screen_feature_pod_controller.cc",
@@ -1731,6 +1781,8 @@ component("ash") {
     "system/progress_indicator/progress_ring_pulse_animation.h",
     "system/rotation/rotation_lock_feature_pod_controller.cc",
     "system/rotation/rotation_lock_feature_pod_controller.h",
+    "system/scheduled_feature/schedule_utils.cc",
+    "system/scheduled_feature/schedule_utils.h",
     "system/scheduled_feature/scheduled_feature.cc",
     "system/scheduled_feature/scheduled_feature.h",
     "system/screen_layout_observer.cc",
@@ -1745,6 +1797,8 @@ component("ash") {
     "system/session/session_limit_notification_controller.h",
     "system/session/shutdown_confirmation_dialog.cc",
     "system/session/shutdown_confirmation_dialog.h",
+    "system/status_area_animation_controller.cc",
+    "system/status_area_animation_controller.h",
     "system/status_area_widget.cc",
     "system/status_area_widget.h",
     "system/status_area_widget_delegate.cc",
@@ -1770,6 +1824,8 @@ component("ash") {
     "system/time/calendar_month_view.h",
     "system/time/calendar_up_next_view.cc",
     "system/time/calendar_up_next_view.h",
+    "system/time/calendar_up_next_view_background_painter.cc",
+    "system/time/calendar_up_next_view_background_painter.h",
     "system/time/calendar_utils.cc",
     "system/time/calendar_utils.h",
     "system/time/calendar_view.cc",
@@ -1938,8 +1994,8 @@ component("ash") {
     "system/video_conference/bubble/bubble_view.cc",
     "system/video_conference/bubble/bubble_view.h",
     "system/video_conference/bubble/bubble_view_ids.h",
-    "system/video_conference/bubble/return_to_app_button.cc",
-    "system/video_conference/bubble/return_to_app_button.h",
+    "system/video_conference/bubble/return_to_app_panel.cc",
+    "system/video_conference/bubble/return_to_app_panel.h",
     "system/video_conference/bubble/set_value_effects_view.cc",
     "system/video_conference/bubble/set_value_effects_view.h",
     "system/video_conference/bubble/toggle_effects_view.cc",
@@ -2006,19 +2062,23 @@ component("ash") {
     "wallpaper/wallpaper_metrics_manager.h",
     "wallpaper/wallpaper_pref_manager.cc",
     "wallpaper/wallpaper_pref_manager.h",
+    "wallpaper/wallpaper_utils/scored_sample.cc",
+    "wallpaper/wallpaper_utils/scored_sample.h",
     "wallpaper/wallpaper_utils/wallpaper_calculated_colors.cc",
     "wallpaper/wallpaper_utils/wallpaper_calculated_colors.h",
     "wallpaper/wallpaper_utils/wallpaper_color_calculator.cc",
     "wallpaper/wallpaper_utils/wallpaper_color_calculator.h",
-    "wallpaper/wallpaper_utils/wallpaper_color_calculator_observer.h",
     "wallpaper/wallpaper_utils/wallpaper_color_extraction_result.h",
     "wallpaper/wallpaper_utils/wallpaper_ephemeral_user.cc",
     "wallpaper/wallpaper_utils/wallpaper_ephemeral_user.h",
+    "wallpaper/wallpaper_utils/wallpaper_file_utils.cc",
+    "wallpaper/wallpaper_utils/wallpaper_file_utils.h",
     "wallpaper/wallpaper_utils/wallpaper_language.cc",
     "wallpaper/wallpaper_utils/wallpaper_language.h",
     "wallpaper/wallpaper_utils/wallpaper_resizer.cc",
     "wallpaper/wallpaper_utils/wallpaper_resizer.h",
     "wallpaper/wallpaper_utils/wallpaper_resizer_observer.h",
+    "wallpaper/wallpaper_utils/wallpaper_resolution.h",
     "wallpaper/wallpaper_view.cc",
     "wallpaper/wallpaper_view.h",
     "wallpaper/wallpaper_widget_controller.cc",
@@ -2046,6 +2106,12 @@ component("ash") {
     "wm/default_window_resizer.cc",
     "wm/default_window_resizer.h",
     "wm/desks/autotest_desks_api.cc",
+    "wm/desks/cros_next_default_desk_button.cc",
+    "wm/desks/cros_next_default_desk_button.h",
+    "wm/desks/cros_next_desk_button_base.cc",
+    "wm/desks/cros_next_desk_button_base.h",
+    "wm/desks/cros_next_desk_icon_button.cc",
+    "wm/desks/cros_next_desk_icon_button.h",
     "wm/desks/desk.cc",
     "wm/desks/desk.h",
     "wm/desks/desk_action_context_menu.cc",
@@ -2171,12 +2237,10 @@ component("ash") {
     "wm/lock_window_state.h",
     "wm/mru_window_tracker.cc",
     "wm/mru_window_tracker.h",
-    "wm/multitask_menu_nudge_controller.cc",
-    "wm/multitask_menu_nudge_controller.h",
+    "wm/multi_display/multi_display_metrics_controller.cc",
+    "wm/multi_display/multi_display_metrics_controller.h",
     "wm/native_cursor_manager_ash.cc",
     "wm/native_cursor_manager_ash.h",
-    "wm/overlay_event_filter.cc",
-    "wm/overlay_event_filter.h",
     "wm/overlay_layout_manager.cc",
     "wm/overlay_layout_manager.h",
     "wm/overview/cleanup_animation_observer.cc",
@@ -2218,6 +2282,8 @@ component("ash") {
     "wm/overview/overview_wallpaper_controller.h",
     "wm/overview/overview_window_drag_controller.cc",
     "wm/overview/overview_window_drag_controller.h",
+    "wm/overview/scoped_float_container_stacker.cc",
+    "wm/overview/scoped_float_container_stacker.h",
     "wm/overview/scoped_overview_animation_settings.cc",
     "wm/overview/scoped_overview_animation_settings.h",
     "wm/overview/scoped_overview_hide_windows.cc",
@@ -2242,6 +2308,12 @@ component("ash") {
     "wm/session_state_animator.h",
     "wm/session_state_animator_impl.cc",
     "wm/session_state_animator_impl.h",
+    "wm/snap_group/snap_group.cc",
+    "wm/snap_group/snap_group.h",
+    "wm/snap_group/snap_group_controller.cc",
+    "wm/snap_group/snap_group_controller.h",
+    "wm/snap_group/snap_group_lock_button.cc",
+    "wm/snap_group/snap_group_lock_button.h",
     "wm/splitview/split_view_constants.h",
     "wm/splitview/split_view_controller.cc",
     "wm/splitview/split_view_controller.h",
@@ -2403,6 +2475,7 @@ component("ash") {
     "//chromeos/ash/services/multidevice_setup/public/mojom",
     "//chromeos/crosapi/mojom",
     "//chromeos/services/machine_learning/public/mojom",
+    "//chromeos/services/network_config/public/cpp",
     "//chromeos/ui/vector_icons",
     "//components/discardable_memory/public/mojom",
     "//components/version_info:channel",
@@ -2520,7 +2593,6 @@ component("ash") {
     "//chromeos/dbus/init",
     "//chromeos/dbus/power",
     "//chromeos/dbus/power:power_manager_proto",
-    "//chromeos/services/network_config/public/cpp",
     "//chromeos/services/network_config/public/mojom",
     "//chromeos/strings",
     "//chromeos/ui/base",
@@ -2699,6 +2771,7 @@ test("ash_unittests") {
   use_xvfb = use_xvfb_in_this_config
 
   sources = [
+    "accelerators/accelerator_alias_converter_unittest.cc",
     "accelerators/accelerator_commands_unittest.cc",
     "accelerators/accelerator_controller_unittest.cc",
     "accelerators/accelerator_filter_unittest.cc",
@@ -2753,6 +2826,7 @@ test("ash_unittests") {
     "ambient/ui/ambient_animation_resizer_unittest.cc",
     "ambient/ui/ambient_animation_shield_controller_unittest.cc",
     "ambient/ui/ambient_container_view_unittest.cc",
+    "ambient/ui/ambient_video_view_unittest.cc",
     "ambient/ui/jitter_calculator_unittest.cc",
     "ambient/ui/media_string_view_unittest.cc",
     "ambient/ui/photo_view_unittest.cc",
@@ -2765,7 +2839,6 @@ test("ash_unittests") {
     "assistant/assistant_controller_impl_unittest.cc",
     "assistant/assistant_interaction_controller_impl_unittest.cc",
     "assistant/assistant_notification_controller_impl_unittest.cc",
-    "assistant/assistant_screen_context_controller_impl_unittest.cc",
     "assistant/assistant_setup_controller_unittest.cc",
     "assistant/assistant_state_controller_unittest.cc",
     "assistant/assistant_suggestions_controller_impl_unittest.cc",
@@ -2786,12 +2859,12 @@ test("ash_unittests") {
     "bubble/bubble_utils_unittest.cc",
     "capture_mode/capture_mode_camera_unittests.cc",
     "capture_mode/capture_mode_demo_tools_unittests.cc",
-    "capture_mode/capture_mode_test_util.cc",
-    "capture_mode/capture_mode_test_util.h",
+    "capture_mode/capture_mode_feature_pod_controller_unittest.cc",
     "capture_mode/capture_mode_unittests.cc",
     "capture_mode/gif_recording_unittests.cc",
     "child_accounts/parent_access_controller_impl_unittest.cc",
     "clipboard/clipboard_history_controller_unittest.cc",
+    "clipboard/clipboard_history_item_unittest.cc",
     "clipboard/clipboard_history_resource_manager_unittest.cc",
     "clipboard/clipboard_history_unittest.cc",
     "clipboard/clipboard_history_util_unittest.cc",
@@ -2822,7 +2895,6 @@ test("ash_unittests") {
     "display/mirror_window_controller_unittest.cc",
     "display/mouse_cursor_event_filter_unittest.cc",
     "display/overscan_calibrator_unittest.cc",
-    "display/persistent_window_controller_unittest.cc",
     "display/privacy_screen_controller_unittest.cc",
     "display/projecting_observer_unittest.cc",
     "display/refresh_rate_throttle_controller_unittest.cc",
@@ -2848,17 +2920,18 @@ test("ash_unittests") {
     "fast_ink/fast_ink_points_unittest.cc",
     "fast_ink/laser/laser_pointer_controller_unittest.cc",
     "fast_ink/laser/laser_segment_utils_unittest.cc",
+    "fast_ink/view_tree_host_root_view_frame_factory_unittest.cc",
     "focus_cycler_unittest.cc",
     "frame/caption_buttons/frame_caption_button_container_view_unittest.cc",
     "frame/caption_buttons/frame_size_button_unittest.cc",
     "frame/default_frame_header_unittest.cc",
     "frame/non_client_frame_view_ash_unittest.cc",
+    "frame_sink/frame_sink_holder_unittest.cc",
+    "frame_sink/ui_resource_manager_unittest.cc",
     "frame_throttler/frame_throttling_controller_unittest.cc",
     "glanceables/glanceables_unittests.cc",
     "glanceables/glanceables_welcome_label_unittest.cc",
     "glanceables/signout_screenshot_handler_unittest.cc",
-    "highlighter/highlighter_controller_unittest.cc",
-    "highlighter/highlighter_gesture_util_unittest.cc",
     "host/ash_window_tree_host_platform_unittest.cc",
     "host/ash_window_tree_host_unified_unittest.cc",
     "ime/ime_controller_impl_unittest.cc",
@@ -2930,6 +3003,8 @@ test("ash_unittests") {
     "root_window_controller_unittest.cc",
     "rotator/screen_rotation_animation_unittest.cc",
     "rotator/screen_rotation_animator_unittest.cc",
+    "rounded_display/rounded_display_gutter_factory_unittest.cc",
+    "rounded_display/rounded_display_gutter_unittest.cc",
     "screen_util_unittest.cc",
     "session/fullscreen_controller_unittest.cc",
     "session/fullscreen_notification_bubble_unittest.cc",
@@ -2955,6 +3030,7 @@ test("ash_unittests") {
     "shelf/shelf_drag_handle_unittest.cc",
     "shelf/shelf_layout_manager_unittest.cc",
     "shelf/shelf_locking_manager_unittest.cc",
+    "shelf/shelf_party_feature_pod_controller_unittest.cc",
     "shelf/shelf_tooltip_manager_unittest.cc",
     "shelf/shelf_unittest.cc",
     "shelf/shelf_view_unittest.cc",
@@ -2968,6 +3044,7 @@ test("ash_unittests") {
     "shell_unittest.cc",
     "style/ash_color_mixer_unittest.cc",
     "style/ash_color_provider_unittest.cc",
+    "style/color_palette_controller_unittest.cc",
     "style/color_util_unittest.cc",
     "style/dark_light_mode_controller_unittests.cc",
     "style/dark_light_mode_nudge_controller_unittests.cc",
@@ -2983,6 +3060,8 @@ test("ash_unittests") {
     "system/accessibility/select_to_speak/select_to_speak_tray_unittest.cc",
     "system/accessibility/switch_access/switch_access_back_button_bubble_controller_unittest.cc",
     "system/accessibility/switch_access/switch_access_menu_bubble_controller_unittest.cc",
+    "system/audio/audio_detailed_view_unittest.cc",
+    "system/audio/audio_effects_controller_unittest.cc",
     "system/audio/unified_audio_detailed_view_controller_unittest.cc",
     "system/audio/unified_volume_view_unittest.cc",
     "system/bluetooth/bluetooth_detailed_view_controller_unittest.cc",
@@ -3000,7 +3079,9 @@ test("ash_unittests") {
     "system/bluetooth/fake_bluetooth_detailed_view.h",
     "system/bluetooth/fake_bluetooth_device_list_controller.cc",
     "system/bluetooth/fake_bluetooth_device_list_controller.h",
+    "system/brightness/display_detailed_view_unittest.cc",
     "system/brightness/unified_brightness_view_unittest.cc",
+    "system/camera/autozoom_feature_pod_controller_unittest.cc",
     "system/camera/autozoom_toast_controller_unittest.cc",
     "system/camera/camera_effects_controller_unittest.cc",
     "system/caps_lock_notification_controller_unittest.cc",
@@ -3020,7 +3101,7 @@ test("ash_unittests") {
     "system/do_not_disturb_notification_controller_unittest.cc",
     "system/eche/eche_icon_loading_indicator_view_unittest.cc",
     "system/eche/eche_tray_unittest.cc",
-    "system/federated/federated_service_controller_unittest.cc",
+    "system/federated/federated_service_controller_impl_unittest.cc",
     "system/firmware_update/firmware_update_notification_controller_unittest.cc",
     "system/geolocation/geolocation_controller_test_util.cc",
     "system/geolocation/geolocation_controller_test_util.h",
@@ -3029,6 +3110,7 @@ test("ash_unittests") {
     "system/holding_space/holding_space_animation_registry_unittest.cc",
     "system/holding_space/holding_space_ash_test_base.cc",
     "system/holding_space/holding_space_ash_test_base.h",
+    "system/holding_space/holding_space_item_screen_capture_view_unittest.cc",
     "system/holding_space/holding_space_item_views_section_unittest.cc",
     "system/holding_space/holding_space_tray_child_bubble_unittest.cc",
     "system/holding_space/holding_space_tray_unittest.cc",
@@ -3042,20 +3124,22 @@ test("ash_unittests") {
     "system/human_presence/snooping_protection_notification_blocker_unittest.cc",
     "system/ime/ime_feature_pod_controller_unittest.cc",
     "system/ime_menu/ime_menu_tray_unittest.cc",
-    "system/input_device_settings/initializers/fake_input_device_tracker.cc",
-    "system/input_device_settings/initializers/fake_input_device_tracker.h",
-    "system/input_device_settings/initializers/input_device_tracker_unittest.cc",
-    "system/input_device_settings/initializers/keyboard_pref_initializer_unittest.cc",
-    "system/input_device_settings/initializers/mouse_pref_initializer_unittest.cc",
-    "system/input_device_settings/initializers/pointing_stick_pref_initializer_unittest.cc",
-    "system/input_device_settings/initializers/touchpad_pref_initializer_unittest.cc",
-    "system/input_device_settings/input_device_pref_manager_unittest.cc",
+    "system/input_device_settings/input_device_notifier_unittest.cc",
     "system/input_device_settings/input_device_settings_controller_unittest.cc",
+    "system/input_device_settings/input_device_settings_dispatcher_unittest.cc",
+    "system/input_device_settings/input_device_settings_utils_unittest.cc",
+    "system/input_device_settings/input_device_tracker_unittest.cc",
+    "system/input_device_settings/keyboard_modifier_metrics_recorder_unittest.cc",
+    "system/input_device_settings/pref_handlers/keyboard_pref_handler_unittest.cc",
+    "system/input_device_settings/pref_handlers/mouse_pref_handler_unittest.cc",
+    "system/input_device_settings/pref_handlers/pointing_stick_pref_handler_unittest.cc",
+    "system/input_device_settings/pref_handlers/touchpad_pref_handler_unittest.cc",
     "system/keyboard_brightness/keyboard_backlight_color_controller_unittest.cc",
     "system/keyboard_brightness/keyboard_backlight_color_nudge_controller_unittest.cc",
+    "system/locale/locale_detailed_view_unittest.cc",
     "system/locale/locale_feature_pod_controller_unittest.cc",
+    "system/lock_screen_notification_controller_unittest.cc",
     "system/machine_learning/user_settings_event_logger_unittest.cc",
-    "system/media/media_notification_provider_impl_unittest.cc",
     "system/media/media_tray_unittest.cc",
     "system/media/unified_media_controls_container_unittest.cc",
     "system/media/unified_media_controls_controller_unittest.cc",
@@ -3065,13 +3149,13 @@ test("ash_unittests") {
     "system/message_center/inactive_user_notification_blocker_unittest.cc",
     "system/message_center/message_center_ui_controller_unittest.cc",
     "system/message_center/message_center_utils_unittest.cc",
+    "system/message_center/message_popup_animation_waiter_unittest.cc",
     "system/message_center/metrics_utils_unittest.cc",
     "system/message_center/notification_grouping_controller_unittest.cc",
     "system/message_center/notification_swipe_control_view_unittest.cc",
     "system/message_center/notifier_settings_view_unittest.cc",
     "system/message_center/session_state_notification_blocker_unittest.cc",
     "system/message_center/unified_message_center_bubble_unittest.cc",
-    "system/microphone_mute/microphone_mute_notification_controller_unittest.cc",
     "system/nearby_share/nearby_share_feature_pod_controller_unittest.cc",
     "system/network/active_network_icon_unittest.cc",
     "system/network/auto_connect_notifier_unittest.cc",
@@ -3107,12 +3191,13 @@ test("ash_unittests") {
     "system/palette/palette_tray_unittest.cc",
     "system/palette/palette_welcome_bubble_unittest.cc",
     "system/palette/tools/create_note_unittest.cc",
-    "system/palette/tools/metalayer_unittest.cc",
     "system/pcie_peripheral/pcie_peripheral_notification_controller_unittest.cc",
     "system/phonehub/app_stream_launcher_view_unittest.cc",
     "system/phonehub/camera_roll_thumbnail_unittest.cc",
     "system/phonehub/camera_roll_view_unittest.cc",
+    "system/phonehub/loading_indicator_view_unittest.cc",
     "system/phonehub/phone_hub_notification_controller_unittest.cc",
+    "system/phonehub/phone_hub_nudge_controller_unittest.cc",
     "system/phonehub/phone_hub_recent_apps_view_unittest.cc",
     "system/phonehub/phone_hub_tray_unittest.cc",
     "system/phonehub/phone_hub_ui_controller_unittest.cc",
@@ -3143,14 +3228,18 @@ test("ash_unittests") {
     "system/privacy_hub/microphone_privacy_switch_controller_unittest.cc",
     "system/privacy_hub/privacy_hub_metrics_unittest.cc",
     "system/privacy_hub/privacy_hub_notification_controller_unittest.cc",
+    "system/privacy_hub/privacy_hub_notification_unittest.cc",
+    "system/privacy_screen/privacy_screen_feature_pod_controller_unittest.cc",
     "system/progress_indicator/progress_indicator_animation_registry_unittest.cc",
     "system/progress_indicator/progress_indicator_unittest.cc",
     "system/rotation/rotation_lock_feature_pod_controller_unittest.cc",
+    "system/scheduled_feature/schedule_utils_unittest.cc",
     "system/scheduled_feature/scheduled_feature_unittest.cc",
     "system/screen_layout_observer_unittest.cc",
     "system/session/logout_button_tray_unittest.cc",
     "system/session/logout_confirmation_controller_unittest.cc",
     "system/session/session_limit_notification_controller_unittest.cc",
+    "system/status_area_animation_controller_unittest.cc",
     "system/status_area_widget_unittest.cc",
     "system/time/calendar_event_fetch_unittest.cc",
     "system/time/calendar_event_list_item_view_jelly_unittest.cc",
@@ -3187,6 +3276,7 @@ test("ash_unittests") {
     "system/unified/power_button_unittest.cc",
     "system/unified/quick_settings_footer_unittest.cc",
     "system/unified/quick_settings_header_unittest.cc",
+    "system/unified/quick_settings_view_unittest.cc",
     "system/unified/quiet_mode_feature_pod_controller_unittest.cc",
     "system/unified/top_shortcuts_view_unittest.cc",
     "system/unified/unified_system_info_view_unittest.cc",
@@ -3196,7 +3286,9 @@ test("ash_unittests") {
     "system/update/update_notification_controller_unittest.cc",
     "system/usb_peripheral/usb_peripheral_notification_controller_unittest.cc",
     "system/video_conference/bubble/bubble_view_unittest.cc",
+    "system/video_conference/bubble/return_to_app_panel_unittest.cc",
     "system/video_conference/effects/video_conference_tray_effects_manager_unittest.cc",
+    "system/video_conference/video_conference_tray_controller_unittest.cc",
     "system/video_conference/video_conference_tray_unittest.cc",
     "system/virtual_keyboard/virtual_keyboard_tray_unittest.cc",
     "test/ash_test_helper_unittest.cc",
@@ -3219,6 +3311,7 @@ test("ash_unittests") {
     "wallpaper/wallpaper_pref_manager_unittest.cc",
     "wallpaper/wallpaper_utils/wallpaper_color_calculator_unittest.cc",
     "wallpaper/wallpaper_utils/wallpaper_ephemeral_user_unittest.cc",
+    "wallpaper/wallpaper_utils/wallpaper_file_utils_unittest.cc",
     "wallpaper/wallpaper_utils/wallpaper_language_unittest.cc",
     "wallpaper/wallpaper_utils/wallpaper_resizer_unittest.cc",
     "wallpaper/wallpaper_window_state_manager_unittest.cc",
@@ -3247,9 +3340,10 @@ test("ash_unittests") {
     "wm/lock_layout_manager_unittest.cc",
     "wm/lock_state_controller_unittest.cc",
     "wm/mru_window_tracker_unittest.cc",
+    "wm/multi_display/multi_display_metrics_controller_unittest.cc",
+    "wm/multi_display/persistent_window_controller_unittest.cc",
     "wm/multitask_menu_nudge_controller_unittest.cc",
     "wm/native_cursor_manager_ash_unittest.cc",
-    "wm/overlay_event_filter_unittest.cc",
     "wm/overlay_layout_manager_unittest.cc",
     "wm/overview/cleanup_animation_observer_unittest.cc",
     "wm/overview/delayed_animation_observer_impl_unittest.cc",
@@ -3273,6 +3367,7 @@ test("ash_unittests") {
     "wm/screen_dimmer_unittest.cc",
     "wm/screen_pinning_controller_unittest.cc",
     "wm/session_state_animator_impl_unittest.cc",
+    "wm/snap_group/snap_group_unittest.cc",
     "wm/splitview/split_view_controller_unittest.cc",
     "wm/splitview/split_view_drag_indicators_unittest.cc",
     "wm/splitview/split_view_highlight_view_unittest.cc",
@@ -3390,6 +3485,7 @@ test("ash_unittests") {
     "//chromeos/ash/services/multidevice_setup/public/cpp:test_support",
     "//chromeos/ash/services/multidevice_setup/public/mojom",
     "//chromeos/ash/services/nearby/public/cpp",
+    "//chromeos/ash/services/network_config/public/cpp:test_support",
     "//chromeos/ash/services/recording:test_support",
     "//chromeos/components/sensors:sensors",
     "//chromeos/components/sensors:test_support",
@@ -3399,6 +3495,7 @@ test("ash_unittests") {
     "//chromeos/dbus/power",
     "//chromeos/dbus/power:power_manager_proto",
     "//chromeos/services/network_config/public/cpp",
+    "//chromeos/services/network_config/public/cpp:test_support",
     "//chromeos/services/network_config/public/mojom",
     "//chromeos/strings:strings_grit",
     "//chromeos/ui/base",
@@ -3420,7 +3517,6 @@ test("ash_unittests") {
     "//components/prefs:test_support",
     "//components/quirks",
     "//components/services/app_service/public/cpp:app_update",
-    "//components/services/app_service/public/mojom",
     "//components/session_manager/core",
     "//components/soda",
     "//components/sync_preferences:test_support",
@@ -3431,8 +3527,10 @@ test("ash_unittests") {
     "//components/viz/test:test_support",
     "//device/bluetooth",
     "//device/bluetooth:mocks",
+    "//device/udev_linux:test_support",
     "//extensions/common:common_constants",
     "//google_apis/calendar",
+    "//media/capture/video/chromeos/mojom:cros_camera",
     "//mojo/core/embedder",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/test_support:test_utils",
@@ -3523,6 +3621,8 @@ test("ash_unittests") {
 
 test("ash_pixeltests") {
   sources = [
+    "ambient/ui/ambient_info_view_pixeltest.cc",
+    "ambient/ui/media_string_view_pixeltest.cc",
     "app_list/views/app_list_item_view_pixeltest.cc",
     "app_list/views/app_list_view_pixeltest.cc",
     "fullscreen_pixeltest.cc",
@@ -3531,6 +3631,7 @@ test("ash_pixeltests") {
     "shelf/shelf_layout_manager_pixeltest.cc",
     "system/accessibility/accessibility_detailed_view_pixeltest.cc",
     "system/bluetooth/bluetooth_detailed_view_legacy_pixeltest.cc",
+    "system/channel_indicator/channel_indicator_quick_settings_view_pixeltest.cc",
     "system/message_center/ash_notification_view_pixeltest.cc",
     "system/time/calendar_unittest_utils.cc",
     "system/time/calendar_unittest_utils.h",
@@ -3546,6 +3647,7 @@ test("ash_pixeltests") {
     "//ash/app_list",
     "//ash/app_list:test_support",
     "//ash/public/cpp",
+    "//ash/public/cpp:test_support",
     "//base/test:test_support",
     "//chromeos/ash/services/bluetooth_config:test_support",
     "//chromeos/dbus/power:power",
@@ -3553,6 +3655,7 @@ test("ash_pixeltests") {
     "//components/viz/test:test_support",
     "//google_apis/calendar:test_support",
     "//mojo/core/embedder:embedder",
+    "//ui/message_center",
     "//ui/views:test_support",
   ]
 }
@@ -3584,6 +3687,8 @@ test("ash_perftests") {
 static_library("test_support") {
   testonly = true
   sources = [
+    "accelerators/accelerator_alias_converter.cc",
+    "accelerators/accelerator_alias_converter.h",
     "accessibility/accessibility_controller_test_api_impl.cc",
     "accessibility/accessibility_controller_test_api_impl.h",
     "accessibility/test_accessibility_controller_client.cc",
@@ -3627,6 +3732,8 @@ static_library("test_support") {
     "capture_mode/capture_mode_session_test_api.h",
     "capture_mode/capture_mode_settings_test_api.cc",
     "capture_mode/capture_mode_settings_test_api.h",
+    "capture_mode/capture_mode_test_util.cc",
+    "capture_mode/capture_mode_test_util.h",
     "capture_mode/fake_camera_device.cc",
     "capture_mode/fake_camera_device.h",
     "capture_mode/fake_folder_selection_dialog_factory.cc",
@@ -3644,14 +3751,18 @@ static_library("test_support") {
     "display/screen_orientation_controller_test_api.cc",
     "display/screen_orientation_controller_test_api.h",
     "drag_drop/drag_drop_controller_test_api.h",
+    "drag_drop/mock_drag_drop_observer.cc",
+    "drag_drop/mock_drag_drop_observer.h",
+    "events/keyboard_capability_delegate_impl.cc",
+    "events/keyboard_capability_delegate_impl.h",
     "fast_ink/laser/laser_pointer_controller_test_api.cc",
     "fast_ink/laser/laser_pointer_controller_test_api.h",
+    "frame_sink/frame_sink_holder_test_api.cc",
+    "frame_sink/frame_sink_holder_test_api.h",
     "frame_throttler/mock_frame_throttling_observer.cc",
     "frame_throttler/mock_frame_throttling_observer.h",
     "glanceables/test_glanceables_delegate.cc",
     "glanceables/test_glanceables_delegate.h",
-    "highlighter/highlighter_controller_test_api.cc",
-    "highlighter/highlighter_controller_test_api.h",
     "ime/test_ime_controller_client.cc",
     "ime/test_ime_controller_client.h",
     "keyboard/test_keyboard_ui.cc",
@@ -3673,10 +3784,16 @@ static_library("test_support") {
     "projector/test/mock_projector_metadata_controller.h",
     "projector/test/mock_projector_ui_controller.cc",
     "projector/test/mock_projector_ui_controller.h",
+    "public/cpp/fake_hats_bluetooth_revamp_trigger_impl.cc",
+    "public/cpp/fake_hats_bluetooth_revamp_trigger_impl.h",
     "system/diagnostics/log_test_helpers.cc",
     "system/diagnostics/log_test_helpers.h",
     "system/geolocation/test_geolocation_url_loader_factory.cc",
     "system/geolocation/test_geolocation_url_loader_factory.h",
+    "system/message_center/message_center_test_util.cc",
+    "system/message_center/message_center_test_util.h",
+    "system/message_center/message_popup_animation_waiter.cc",
+    "system/message_center/message_popup_animation_waiter.h",
     "system/test_system_sounds_delegate.cc",
     "system/test_system_sounds_delegate.h",
     "system/tray/system_nudge_label.cc",
@@ -3771,6 +3888,8 @@ static_library("test_support") {
     "test_shell_delegate.h",
     "wallpaper/test_wallpaper_controller_client.cc",
     "wallpaper/test_wallpaper_controller_client.h",
+    "wallpaper/test_wallpaper_drivefs_delegate.cc",
+    "wallpaper/test_wallpaper_drivefs_delegate.h",
     "wallpaper/wallpaper_controller_test_api.cc",
     "wallpaper/wallpaper_controller_test_api.h",
     "wm/cursor_manager_test_api.cc",
@@ -3797,8 +3916,6 @@ static_library("test_support") {
     "wm/test_activation_delegate.h",
     "wm/test_child_modal_parent.cc",
     "wm/test_child_modal_parent.h",
-    "wm/test_overlay_delegate.cc",
-    "wm/test_overlay_delegate.h",
     "wm/test_session_state_animator.cc",
     "wm/test_session_state_animator.h",
     "wm/window_preview_view_test_api.cc",
@@ -3813,7 +3930,7 @@ static_library("test_support") {
   public_deps = [
     "//ash",
     "//chromeos/ash/services/assistant/public/mojom",
-    "//chromeos/services/network_config/public/cpp:test_support",
+    "//chromeos/ash/services/network_config/public/cpp:test_support",
     "//dbus",
     "//testing/gtest",
     "//third_party/blink/public:blink_headers",
@@ -3879,6 +3996,7 @@ static_library("test_support") {
     "//ui/aura",
     "//ui/aura:test_support",
     "//ui/base:test_support",
+    "//ui/chromeos/events",
     "//ui/color:mixers",
     "//ui/compositor:test_support",
     "//ui/display",