BASELINE: Update Chromium to 90.0.4430.221

Change-Id: Iff4d9d18d2fcf1a576f3b1f453010f744a232920
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 209 insertions, 104 deletions

diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn
index ca5d00dca44..bf0b085268a 100644
--- a/chromium/ash/BUILD.gn
+++ b/chromium/ash/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/config/features.gni")
 import("//build/config/python.gni")
 import("//build/config/ui.gni")
 import("//chromeos/assistant/ambient.gni")
+import("//chromeos/components/sensors/buildflags.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//testing/test.gni")
 import("//tools/grit/repack.gni")
@@ -55,7 +56,6 @@ component("ash") {
     "public/cpp/debug_utils.h",
     "public/cpp/docked_magnifier_controller.h",
     "public/cpp/event_rewriter_controller.h",
-    "public/cpp/first_run_helper.h",
     "public/cpp/multi_user_window_manager.h",
     "public/cpp/multi_user_window_manager_delegate.h",
     "public/cpp/multi_user_window_manager_observer.h",
@@ -78,6 +78,7 @@ component("ash") {
     "shell_init_params.h",
     "shell_observer.h",
     "sticky_keys/sticky_keys_controller.h",
+    "system/pcie_peripheral/pcie_peripheral_notification_controller.h",
     "system/status_area_widget.h",
     "system/tray/system_tray_notifier.h",
     "system/unified/unified_system_tray.h",
@@ -87,6 +88,7 @@ component("ash") {
     "wm/drag_window_resizer.h",
     "wm/mru_window_tracker.h",
     "wm/overview/overview_controller.h",
+    "wm/overview/overview_observer.h",
     "wm/pip/pip_positioner.h",
     "wm/splitview/split_view_controller.h",
     "wm/tablet_mode/tablet_mode_browser_window_drag_delegate.h",
@@ -129,6 +131,7 @@ component("ash") {
     "accelerators/pre_target_accelerator_handler.h",
     "accelerators/spoken_feedback_toggler.cc",
     "accelerators/spoken_feedback_toggler.h",
+    "accelerometer/accelerometer_constants.h",
     "accelerometer/accelerometer_file_reader.cc",
     "accelerometer/accelerometer_file_reader.h",
     "accelerometer/accelerometer_reader.cc",
@@ -168,6 +171,8 @@ component("ash") {
     "accessibility/point_scan_controller.h",
     "accessibility/point_scan_layer.cc",
     "accessibility/point_scan_layer.h",
+    "accessibility/point_scan_layer_animation_info.cc",
+    "accessibility/point_scan_layer_animation_info.h",
     "accessibility/spoken_feedback_enabler.cc",
     "accessibility/spoken_feedback_enabler.h",
     "accessibility/touch_accessibility_enabler.cc",
@@ -181,6 +186,8 @@ component("ash") {
     "ambient/ambient_constants.h",
     "ambient/ambient_controller.cc",
     "ambient/ambient_controller.h",
+    "ambient/ambient_photo_cache.cc",
+    "ambient/ambient_photo_cache.h",
     "ambient/ambient_photo_controller.cc",
     "ambient/ambient_photo_controller.h",
     "ambient/ambient_view_delegate_impl.cc",
@@ -189,18 +196,16 @@ component("ash") {
     "ambient/model/ambient_backend_model.cc",
     "ambient/model/ambient_backend_model.h",
     "ambient/model/ambient_backend_model_observer.h",
-    "ambient/ui/ambient_assistant_container_view.cc",
-    "ambient/ui/ambient_assistant_container_view.h",
-    "ambient/ui/ambient_assistant_dialog_plate.cc",
-    "ambient/ui/ambient_assistant_dialog_plate.h",
     "ambient/ui/ambient_background_image_view.cc",
     "ambient/ui/ambient_background_image_view.h",
     "ambient/ui/ambient_container_view.cc",
     "ambient/ui/ambient_container_view.h",
+    "ambient/ui/ambient_info_view.cc",
+    "ambient/ui/ambient_info_view.h",
+    "ambient/ui/ambient_shield_view.cc",
+    "ambient/ui/ambient_shield_view.h",
     "ambient/ui/ambient_view_delegate.h",
     "ambient/ui/ambient_view_ids.h",
-    "ambient/ui/assistant_response_container_view.cc",
-    "ambient/ui/assistant_response_container_view.h",
     "ambient/ui/glanceable_info_view.cc",
     "ambient/ui/glanceable_info_view.h",
     "ambient/ui/media_string_view.cc",
@@ -254,10 +259,6 @@ component("ash") {
     "autoclick/autoclick_scroll_position_handler.cc",
     "autoclick/autoclick_scroll_position_handler.h",
     "autotest_private_api_utils.cc",
-    "bloom/bloom_ui_controller_impl.cc",
-    "bloom/bloom_ui_controller_impl.h",
-    "bloom/bloom_ui_delegate_impl.cc",
-    "bloom/bloom_ui_delegate_impl.h",
     "bluetooth_devices_observer.cc",
     "bluetooth_devices_observer.h",
     "cancel_mode.cc",
@@ -275,8 +276,16 @@ component("ash") {
     "capture_mode/capture_mode_feature_pod_controller.h",
     "capture_mode/capture_mode_metrics.cc",
     "capture_mode/capture_mode_metrics.h",
+    "capture_mode/capture_mode_notification_view.cc",
+    "capture_mode/capture_mode_notification_view.h",
     "capture_mode/capture_mode_session.cc",
     "capture_mode/capture_mode_session.h",
+    "capture_mode/capture_mode_session_focus_cycler.cc",
+    "capture_mode/capture_mode_session_focus_cycler.h",
+    "capture_mode/capture_mode_settings_entry_view.cc",
+    "capture_mode/capture_mode_settings_entry_view.h",
+    "capture_mode/capture_mode_settings_view.cc",
+    "capture_mode/capture_mode_settings_view.h",
     "capture_mode/capture_mode_source_view.cc",
     "capture_mode/capture_mode_source_view.h",
     "capture_mode/capture_mode_test_api.cc",
@@ -315,14 +324,25 @@ component("ash") {
     "clipboard/clipboard_nudge_constants.h",
     "clipboard/clipboard_nudge_controller.cc",
     "clipboard/clipboard_nudge_controller.h",
+    "clipboard/control_v_histogram_recorder.cc",
+    "clipboard/control_v_histogram_recorder.h",
     "clipboard/scoped_clipboard_history_pause_impl.cc",
     "clipboard/scoped_clipboard_history_pause_impl.h",
     "clipboard/views/clipboard_history_bitmap_item_view.cc",
     "clipboard/views/clipboard_history_bitmap_item_view.h",
+    "clipboard/views/clipboard_history_delete_button.cc",
+    "clipboard/views/clipboard_history_delete_button.h",
+    "clipboard/views/clipboard_history_file_item_view.cc",
+    "clipboard/views/clipboard_history_file_item_view.h",
     "clipboard/views/clipboard_history_item_view.cc",
     "clipboard/views/clipboard_history_item_view.h",
+    "clipboard/views/clipboard_history_label.cc",
+    "clipboard/views/clipboard_history_label.h",
+    "clipboard/views/clipboard_history_main_button.cc",
+    "clipboard/views/clipboard_history_main_button.h",
     "clipboard/views/clipboard_history_text_item_view.cc",
     "clipboard/views/clipboard_history_text_item_view.h",
+    "clipboard/views/clipboard_history_view_constants.h",
     "dbus/ash_dbus_services.cc",
     "dbus/ash_dbus_services.h",
     "dbus/display_service_provider.cc",
@@ -451,10 +471,6 @@ component("ash") {
     "fast_ink/view_tree_host_root_view.h",
     "fast_ink/view_tree_host_widget.cc",
     "fast_ink/view_tree_host_widget.h",
-    "first_run/desktop_cleaner.cc",
-    "first_run/desktop_cleaner.h",
-    "first_run/first_run_helper_impl.cc",
-    "first_run/first_run_helper_impl.h",
     "focus_cycler.cc",
     "focus_cycler.h",
     "frame/header_view.cc",
@@ -477,8 +493,6 @@ component("ash") {
     "highlighter/highlighter_view.h",
     "home_screen/drag_window_from_shelf_controller.cc",
     "home_screen/drag_window_from_shelf_controller.h",
-    "home_screen/home_launcher_gesture_handler.cc",
-    "home_screen/home_launcher_gesture_handler.h",
     "home_screen/home_screen_controller.cc",
     "home_screen/home_screen_controller.h",
     "home_screen/home_screen_delegate.h",
@@ -501,8 +515,6 @@ component("ash") {
     "host/root_window_transformer.h",
     "host/transformer_helper.cc",
     "host/transformer_helper.h",
-    "hud_display/compositor_stats.cc",
-    "hud_display/compositor_stats.h",
     "hud_display/cpu_graph_page_view.cc",
     "hud_display/cpu_graph_page_view.h",
     "hud_display/cpu_status.cc",
@@ -687,6 +699,8 @@ component("ash") {
     "metrics/histogram_macros.h",
     "metrics/login_metrics_recorder.cc",
     "metrics/login_metrics_recorder.h",
+    "metrics/login_unlock_throughput_recorder.cc",
+    "metrics/login_unlock_throughput_recorder.h",
     "metrics/pip_uma.h",
     "metrics/pointer_metrics_recorder.cc",
     "metrics/pointer_metrics_recorder.h",
@@ -707,14 +721,28 @@ component("ash") {
     "multi_user/user_switch_animator.h",
     "policy/policy_recommendation_restorer.cc",
     "policy/policy_recommendation_restorer.h",
-    "power/hfp_battery_listener.cc",
-    "power/hfp_battery_listener.h",
-    "power/hid_battery_listener.cc",
-    "power/hid_battery_listener.h",
     "power/hid_battery_util.cc",
     "power/hid_battery_util.h",
-    "power/peripheral_battery_tracker.cc",
-    "power/peripheral_battery_tracker.h",
+    "projector/model/projector_ui_model.cc",
+    "projector/model/projector_ui_model.h",
+    "projector/projector_controller_impl.cc",
+    "projector/projector_controller_impl.h",
+    "projector/projector_feature_pod_controller.cc",
+    "projector/projector_feature_pod_controller.h",
+    "projector/projector_metadata_controller.cc",
+    "projector/projector_metadata_controller.h",
+    "projector/projector_metadata_model.cc",
+    "projector/projector_metadata_model.h",
+    "projector/projector_ui_controller.cc",
+    "projector/projector_ui_controller.h",
+    "projector/ui/projector_bar_view.cc",
+    "projector/ui/projector_bar_view.h",
+    "projector/ui/projector_button.cc",
+    "projector/ui/projector_button.h",
+    "projector/ui/projector_color_button.cc",
+    "projector/ui/projector_color_button.h",
+    "projector/ui/projector_image_button.cc",
+    "projector/ui/projector_image_button.h",
     "quick_answers/quick_answers_controller_impl.cc",
     "quick_answers/quick_answers_controller_impl.h",
     "quick_answers/quick_answers_ui_controller.cc",
@@ -768,6 +796,8 @@ component("ash") {
     "shelf/contextual_tooltip.h",
     "shelf/drag_handle.cc",
     "shelf/drag_handle.h",
+    "shelf/gradient_layer_delegate.cc",
+    "shelf/gradient_layer_delegate.h",
     "shelf/home_button.cc",
     "shelf/home_button.h",
     "shelf/home_button_controller.cc",
@@ -890,10 +920,16 @@ component("ash") {
     "system/accessibility/floating_menu_button.h",
     "system/accessibility/floating_menu_utils.cc",
     "system/accessibility/floating_menu_utils.h",
+    "system/accessibility/select_to_speak_constants.h",
     "system/accessibility/select_to_speak_menu_bubble_controller.cc",
     "system/accessibility/select_to_speak_menu_bubble_controller.h",
     "system/accessibility/select_to_speak_menu_view.cc",
     "system/accessibility/select_to_speak_menu_view.h",
+    "system/accessibility/select_to_speak_metrics_utils.h",
+    "system/accessibility/select_to_speak_speed_bubble_controller.cc",
+    "system/accessibility/select_to_speak_speed_bubble_controller.h",
+    "system/accessibility/select_to_speak_speed_view.cc",
+    "system/accessibility/select_to_speak_speed_view.h",
     "system/accessibility/select_to_speak_tray.cc",
     "system/accessibility/select_to_speak_tray.h",
     "system/accessibility/switch_access_back_button_bubble_controller.cc",
@@ -924,8 +960,6 @@ component("ash") {
     "system/audio/unified_volume_slider_controller.h",
     "system/audio/unified_volume_view.cc",
     "system/audio/unified_volume_view.h",
-    "system/bloom/bloom_tray.cc",
-    "system/bloom/bloom_tray.h",
     "system/bluetooth/bluetooth_detailed_view.cc",
     "system/bluetooth/bluetooth_detailed_view.h",
     "system/bluetooth/bluetooth_feature_pod_controller.cc",
@@ -959,7 +993,6 @@ component("ash") {
     "system/cast/tray_cast.h",
     "system/cast/unified_cast_detailed_view_controller.cc",
     "system/cast/unified_cast_detailed_view_controller.h",
-    "system/dark_mode/color_mode_observer.h",
     "system/dark_mode/dark_mode_detailed_view.cc",
     "system/dark_mode/dark_mode_detailed_view.h",
     "system/dark_mode/dark_mode_detailed_view_controller.cc",
@@ -969,6 +1002,8 @@ component("ash") {
     "system/enterprise/enterprise_domain_observer.h",
     "system/gesture_education/gesture_education_notification_controller.cc",
     "system/gesture_education/gesture_education_notification_controller.h",
+    "system/holding_space/downloads_section.cc",
+    "system/holding_space/downloads_section.h",
     "system/holding_space/holding_space_color_provider_impl.cc",
     "system/holding_space/holding_space_color_provider_impl.h",
     "system/holding_space/holding_space_drag_util.cc",
@@ -983,20 +1018,28 @@ component("ash") {
     "system/holding_space/holding_space_item_view.h",
     "system/holding_space/holding_space_item_view_delegate.cc",
     "system/holding_space/holding_space_item_view_delegate.h",
-    "system/holding_space/holding_space_item_views_container.cc",
-    "system/holding_space/holding_space_item_views_container.h",
+    "system/holding_space/holding_space_item_views_section.cc",
+    "system/holding_space/holding_space_item_views_section.h",
     "system/holding_space/holding_space_tray.cc",
     "system/holding_space/holding_space_tray.h",
     "system/holding_space/holding_space_tray_bubble.cc",
     "system/holding_space/holding_space_tray_bubble.h",
+    "system/holding_space/holding_space_tray_child_bubble.cc",
+    "system/holding_space/holding_space_tray_child_bubble.h",
     "system/holding_space/holding_space_tray_icon.cc",
     "system/holding_space/holding_space_tray_icon.h",
     "system/holding_space/holding_space_tray_icon_preview.cc",
     "system/holding_space/holding_space_tray_icon_preview.h",
-    "system/holding_space/pinned_files_container.cc",
-    "system/holding_space/pinned_files_container.h",
-    "system/holding_space/recent_files_container.cc",
-    "system/holding_space/recent_files_container.h",
+    "system/holding_space/holding_space_util.cc",
+    "system/holding_space/holding_space_util.h",
+    "system/holding_space/pinned_files_bubble.cc",
+    "system/holding_space/pinned_files_bubble.h",
+    "system/holding_space/pinned_files_section.cc",
+    "system/holding_space/pinned_files_section.h",
+    "system/holding_space/recent_files_bubble.cc",
+    "system/holding_space/recent_files_bubble.h",
+    "system/holding_space/screen_captures_section.cc",
+    "system/holding_space/screen_captures_section.h",
     "system/ime/ime_feature_pod_controller.cc",
     "system/ime/ime_feature_pod_controller.h",
     "system/ime/ime_observer.h",
@@ -1053,6 +1096,8 @@ component("ash") {
     "system/message_center/message_center_ui_controller.cc",
     "system/message_center/message_center_ui_controller.h",
     "system/message_center/message_center_ui_delegate.h",
+    "system/message_center/message_center_utils.cc",
+    "system/message_center/message_center_utils.h",
     "system/message_center/metrics_utils.cc",
     "system/message_center/metrics_utils.h",
     "system/message_center/notification_swipe_control_view.cc",
@@ -1094,6 +1139,8 @@ component("ash") {
     "system/network/active_network_icon.h",
     "system/network/auto_connect_notifier.cc",
     "system/network/auto_connect_notifier.h",
+    "system/network/cellular_setup_notifier.cc",
+    "system/network/cellular_setup_notifier.h",
     "system/network/network_feature_pod_button.cc",
     "system/network/network_feature_pod_button.h",
     "system/network/network_feature_pod_controller.cc",
@@ -1155,6 +1202,8 @@ component("ash") {
     "system/palette/palette_utils.h",
     "system/palette/palette_welcome_bubble.cc",
     "system/palette/palette_welcome_bubble.h",
+    "system/palette/stylus_battery_delegate.cc",
+    "system/palette/stylus_battery_delegate.h",
     "system/palette/tools/capture_region_mode.cc",
     "system/palette/tools/capture_region_mode.h",
     "system/palette/tools/capture_screen_action.cc",
@@ -1169,16 +1218,13 @@ component("ash") {
     "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/phonehub/bluetooth_disabled_view.cc",
     "system/phonehub/bluetooth_disabled_view.h",
-    "system/phonehub/connection_error_view.cc",
-    "system/phonehub/connection_error_view.h",
     "system/phonehub/continue_browsing_chip.cc",
     "system/phonehub/continue_browsing_chip.h",
     "system/phonehub/enable_hotspot_quick_action_controller.cc",
     "system/phonehub/enable_hotspot_quick_action_controller.h",
-    "system/phonehub/initial_connecting_view.cc",
-    "system/phonehub/initial_connecting_view.h",
     "system/phonehub/interstitial_view_button.cc",
     "system/phonehub/interstitial_view_button.h",
     "system/phonehub/locate_phone_quick_action_controller.cc",
@@ -1189,6 +1235,10 @@ component("ash") {
     "system/phonehub/onboarding_view.h",
     "system/phonehub/phone_connected_view.cc",
     "system/phonehub/phone_connected_view.h",
+    "system/phonehub/phone_connecting_view.cc",
+    "system/phonehub/phone_connecting_view.h",
+    "system/phonehub/phone_disconnected_view.cc",
+    "system/phonehub/phone_disconnected_view.h",
     "system/phonehub/phone_hub_content_view.cc",
     "system/phonehub/phone_hub_content_view.h",
     "system/phonehub/phone_hub_interstitial_view.cc",
@@ -1213,6 +1263,8 @@ component("ash") {
     "system/phonehub/silence_phone_quick_action_controller.h",
     "system/phonehub/task_continuation_view.cc",
     "system/phonehub/task_continuation_view.h",
+    "system/phonehub/tether_connection_pending_view.cc",
+    "system/phonehub/tether_connection_pending_view.h",
     "system/phonehub/ui_constants.h",
     "system/power/backlights_forced_off_setter.cc",
     "system/power/backlights_forced_off_setter.h",
@@ -1222,6 +1274,8 @@ component("ash") {
     "system/power/battery_notification.h",
     "system/power/dual_role_notification.cc",
     "system/power/dual_role_notification.h",
+    "system/power/peripheral_battery_listener.cc",
+    "system/power/peripheral_battery_listener.h",
     "system/power/peripheral_battery_notifier.cc",
     "system/power/peripheral_battery_notifier.h",
     "system/power/power_button_controller.cc",
@@ -1283,8 +1337,6 @@ component("ash") {
     "system/status_area_widget_delegate.h",
     "system/supervised/supervised_icon_string.cc",
     "system/supervised/supervised_icon_string.h",
-    "system/supervised/supervised_notification_controller.cc",
-    "system/supervised/supervised_notification_controller.h",
     "system/system_notification_controller.cc",
     "system/system_notification_controller.h",
     "system/time/time_tray_item_view.cc",
@@ -1367,6 +1419,8 @@ component("ash") {
     "system/unified/notification_counter_view.h",
     "system/unified/notification_hidden_view.cc",
     "system/unified/notification_hidden_view.h",
+    "system/unified/notification_icons_controller.cc",
+    "system/unified/notification_icons_controller.h",
     "system/unified/page_indicator_view.cc",
     "system/unified/page_indicator_view.h",
     "system/unified/quiet_mode_feature_pod_controller.cc",
@@ -1379,8 +1433,6 @@ component("ash") {
     "system/unified/top_shortcut_button.h",
     "system/unified/top_shortcuts_view.cc",
     "system/unified/top_shortcuts_view.h",
-    "system/unified/unified_managed_device_view.cc",
-    "system/unified/unified_managed_device_view.h",
     "system/unified/unified_notifier_settings_controller.cc",
     "system/unified/unified_notifier_settings_controller.h",
     "system/unified/unified_slider_bubble_controller.cc",
@@ -1423,6 +1475,8 @@ component("ash") {
     "tray_action/tray_action.cc",
     "tray_action/tray_action.h",
     "tray_action/tray_action_observer.h",
+    "utility/layer_util.cc",
+    "utility/layer_util.h",
     "utility/screenshot_controller.cc",
     "utility/screenshot_controller.h",
     "utility/transformer_util.cc",
@@ -1447,8 +1501,6 @@ component("ash") {
     "wallpaper/wallpaper_widget_controller.h",
     "wallpaper/wallpaper_window_state_manager.cc",
     "wallpaper/wallpaper_window_state_manager.h",
-    "window_factory.cc",
-    "window_factory.h",
     "window_tree_host_lookup.cc",
     "window_user_data.h",
     "wm/always_on_top_controller.cc",
@@ -1478,6 +1530,8 @@ component("ash") {
     "wm/desks/desk_animation_base.h",
     "wm/desks/desk_animation_impl.cc",
     "wm/desks/desk_animation_impl.h",
+    "wm/desks/desk_drag_proxy.cc",
+    "wm/desks/desk_drag_proxy.h",
     "wm/desks/desk_mini_view.cc",
     "wm/desks/desk_mini_view.h",
     "wm/desks/desk_mini_view_animations.cc",
@@ -1490,15 +1544,22 @@ component("ash") {
     "wm/desks/desks_animations.h",
     "wm/desks/desks_bar_view.cc",
     "wm/desks/desks_bar_view.h",
+    "wm/desks/desks_constants.h",
     "wm/desks/desks_controller.cc",
     "wm/desks/desks_histogram_enums.h",
     "wm/desks/desks_restore_util.cc",
     "wm/desks/desks_restore_util.h",
     "wm/desks/desks_util.cc",
+    "wm/desks/expanded_state_new_desk_button.cc",
+    "wm/desks/expanded_state_new_desk_button.h",
     "wm/desks/new_desk_button.cc",
     "wm/desks/new_desk_button.h",
     "wm/desks/root_window_desk_switch_animator.cc",
     "wm/desks/root_window_desk_switch_animator.h",
+    "wm/desks/scroll_arrow_button.cc",
+    "wm/desks/scroll_arrow_button.h",
+    "wm/desks/zero_state_button.cc",
+    "wm/desks/zero_state_button.h",
     "wm/drag_details.cc",
     "wm/drag_details.h",
     "wm/drag_window_controller.cc",
@@ -1506,6 +1567,8 @@ component("ash") {
     "wm/drag_window_resizer.cc",
     "wm/event_client_impl.cc",
     "wm/event_client_impl.h",
+    "wm/full_restore/full_restore_controller.cc",
+    "wm/full_restore/full_restore_controller.h",
     "wm/fullscreen_window_finder.cc",
     "wm/fullscreen_window_finder.h",
     "wm/gestures/back_gesture/back_gesture_affordance.cc",
@@ -1561,7 +1624,6 @@ component("ash") {
     "wm/overview/overview_item.h",
     "wm/overview/overview_item_view.cc",
     "wm/overview/overview_item_view.h",
-    "wm/overview/overview_observer.h",
     "wm/overview/overview_session.cc",
     "wm/overview/overview_session.h",
     "wm/overview/overview_test_api.cc",
@@ -1648,12 +1710,16 @@ component("ash") {
     "wm/video_detector.h",
     "wm/window_animations.cc",
     "wm/window_animations.h",
-    "wm/window_cycle_controller.cc",
-    "wm/window_cycle_controller.h",
-    "wm/window_cycle_event_filter.cc",
-    "wm/window_cycle_event_filter.h",
-    "wm/window_cycle_list.cc",
-    "wm/window_cycle_list.h",
+    "wm/window_cycle/window_cycle_controller.cc",
+    "wm/window_cycle/window_cycle_controller.h",
+    "wm/window_cycle/window_cycle_event_filter.cc",
+    "wm/window_cycle/window_cycle_event_filter.h",
+    "wm/window_cycle/window_cycle_list.cc",
+    "wm/window_cycle/window_cycle_list.h",
+    "wm/window_cycle/window_cycle_tab_slider.cc",
+    "wm/window_cycle/window_cycle_tab_slider.h",
+    "wm/window_cycle/window_cycle_tab_slider_button.cc",
+    "wm/window_cycle/window_cycle_tab_slider_button.h",
     "wm/window_dimmer.cc",
     "wm/window_dimmer.h",
     "wm/window_finder.cc",
@@ -1711,6 +1777,7 @@ component("ash") {
     "//ash/public/cpp/resources:ash_public_unscaled_resources",
     "//ash/resources/vector_icons",
     "//ash/strings",
+    "//chromeos/services/machine_learning/public/mojom",
     "//chromeos/services/multidevice_setup/public/mojom",
     "//chromeos/ui/vector_icons",
     "//components/discardable_memory/public/mojom",
@@ -1723,6 +1790,7 @@ component("ash") {
     "//services/media_session/public/mojom",
     "//skia",
     "//ui/aura",
+    "//ui/base/cursor",
     "//ui/base/cursor:cursor_base",
     "//ui/base/cursor/mojom:cursor_type",
     "//ui/base/dragdrop/mojom:mojom_shared",
@@ -1742,6 +1810,9 @@ component("ash") {
     "//ash/assistant/ui",
     "//ash/assistant/ui:constants",
     "//ash/assistant/util",
+    "//ash/components/audio",
+    "//ash/components/pcie_peripheral",
+    "//ash/constants",
     "//ash/keyboard/ui",
     "//ash/login/resources:resources_grit",
     "//ash/services/recording",
@@ -1756,46 +1827,40 @@ component("ash") {
     "//cc/debug",
     "//cc/paint:paint",
     "//chromeos/assistant:buildflags",
-    "//chromeos/components/bloom/public/cpp",
+    "//chromeos/components/multidevice/logging",
     "//chromeos/components/phonehub",
     "//chromeos/components/quick_answers",
     "//chromeos/components/quick_answers/public/cpp:prefs",
-    "//chromeos/ui/base",
-    "//chromeos/ui/frame",
-    "//services/viz/public/mojom",
-
-    # TODO(https://crbug.com/644336): Make CrasAudioHandler Chrome or Ash only.
-    "//chromeos/audio",
-    "//chromeos/components/multidevice/logging",
-    "//chromeos/constants",
+    "//chromeos/components/sensors:buildflags",
+    "//chromeos/crosapi/cpp",
     "//chromeos/dbus",
-
-    # TODO(https://crbug.com/644336): Remove dependencies on CrasAudioClient.
     "//chromeos/dbus/audio",
     "//chromeos/dbus/constants",
     "//chromeos/dbus/hammerd",
     "//chromeos/dbus/power",
     "//chromeos/dbus/power:power_manager_proto",
     "//chromeos/dbus/services:services",
-
-    # TODO(https://crbug.com/644355): Remove Shill dependencies.
     "//chromeos/dbus/shill",
     "//chromeos/dbus/system_clock",
-
-    # TODO(https://crbug.com/644355): Remove Shill dependencies.
+    "//chromeos/login/login_state",
     "//chromeos/network",
     "//chromeos/services/assistant/public/cpp",
     "//chromeos/services/assistant/public/mojom",
+    "//chromeos/services/libassistant/public/cpp:structs",
     "//chromeos/services/multidevice_setup/public/mojom",
+    "//chromeos/services/nearby/public/cpp",
     "//chromeos/services/network_config/public/cpp",
     "//chromeos/services/network_config/public/mojom",
     "//chromeos/settings",
     "//chromeos/strings",
     "//chromeos/system",
+    "//chromeos/ui/base",
+    "//chromeos/ui/frame",
     "//components/account_id",
     "//components/country_codes",
     "//components/device_event_log",
     "//components/discardable_memory/service",
+    "//components/full_restore",
     "//components/media_message_center",
     "//components/onc",
     "//components/password_manager/core/browser:hash_password_manager",
@@ -1804,6 +1869,7 @@ component("ash") {
     "//components/quirks",
     "//components/services/app_service/public/cpp:app_update",
     "//components/session_manager:base",
+    "//components/session_manager/core",
     "//components/strings",
     "//components/sync",
     "//components/user_manager",
@@ -1820,6 +1886,7 @@ component("ash") {
     "//services/metrics/public/cpp:ukm_builders",
     "//services/network/public/cpp:cpp",
     "//services/preferences/public/cpp",
+    "//services/viz/public/mojom",
 
     # TODO(msw): Remove this; ash should not depend on blink/webkit.
     "//third_party/blink/public:blink_headers",
@@ -1831,7 +1898,6 @@ component("ash") {
     "//ui/accessibility/mojom",
     "//ui/base",
     "//ui/base:ui_data_pack",
-    "//ui/base/cursor",
     "//ui/base/ime/chromeos",
     "//ui/base/ime/init",
     "//ui/chromeos",
@@ -1894,6 +1960,23 @@ component("ash") {
       "//chromeos/assistant/internal/proto/google3",
     ]
   }
+
+  if (use_iioservice) {
+    sources -= [
+      "accelerometer/accelerometer_file_reader.cc",
+      "accelerometer/accelerometer_file_reader.h",
+    ]
+    sources += [
+      "accelerometer/accelerometer_provider_mojo.cc",
+      "accelerometer/accelerometer_provider_mojo.h",
+      "accelerometer/accelerometer_samples_observer.cc",
+      "accelerometer/accelerometer_samples_observer.h",
+    ]
+    deps += [
+      "//chromeos/components/sensors:sensors",
+      "//chromeos/components/sensors/mojom",
+    ]
+  }
 }
 
 # TODO(crbug.com/1112471): Get this to run cleanly under Python 3.
@@ -1937,6 +2020,7 @@ test("ash_unittests") {
     "accessibility/touch_exploration_controller_unittest.cc",
     "accessibility/touch_exploration_manager_unittest.cc",
     "ambient/ambient_controller_unittest.cc",
+    "ambient/ambient_photo_cache_unittest.cc",
     "ambient/ambient_photo_controller_unittest.cc",
     "ambient/autotest_ambient_api_unittest.cc",
     "ambient/model/ambient_backend_model_unittest.cc",
@@ -2022,7 +2106,6 @@ 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",
-    "first_run/first_run_helper_impl_unittest.cc",
     "focus_cycler_unittest.cc",
     "frame/caption_buttons/frame_caption_button_container_view_unittest.cc",
     "frame/caption_buttons/frame_size_button_unittest.cc",
@@ -2094,9 +2177,9 @@ test("ash_unittests") {
     "metrics/user_metrics_recorder_unittest.cc",
     "multi_device_setup/multi_device_notification_presenter_unittest.cc",
     "policy/policy_recommendation_restorer_unittest.cc",
-    "power/hfp_battery_listener_unittest.cc",
-    "power/hid_battery_listener_unittest.cc",
     "power/hid_battery_util_unittest.cc",
+    "projector/projector_controller_unittest.cc",
+    "projector/projector_metadata_model_unittest.cc",
     "quick_answers/quick_answers_controller_unittest.cc",
     "quick_answers/quick_answers_ui_controller_unittest.cc",
     "quick_answers/ui/quick_answers_view_unittest.cc",
@@ -2107,13 +2190,13 @@ test("ash_unittests") {
     "session/session_controller_impl_unittest.cc",
     "shelf/back_button_unittest.cc",
     "shelf/contextual_tooltip_unittest.cc",
+    "shelf/drag_handle_unittest.cc",
     "shelf/home_button_unittest.cc",
     "shelf/home_to_overview_nudge_controller_unittest.cc",
     "shelf/hotseat_widget_unittest.cc",
     "shelf/login_shelf_gesture_controller_unittest.cc",
     "shelf/login_shelf_view_unittest.cc",
     "shelf/scrollable_shelf_view_unittest.cc",
-    "shelf/shelf_app_button_unittest.cc",
     "shelf/shelf_application_menu_model_unittest.cc",
     "shelf/shelf_background_animator_unittest.cc",
     "shelf/shelf_button_pressed_metric_tracker_unittest.cc",
@@ -2144,12 +2227,12 @@ test("ash_unittests") {
     "system/accessibility/dictation_button_tray_unittest.cc",
     "system/accessibility/floating_accessibility_controller_unittest.cc",
     "system/accessibility/select_to_speak_menu_bubble_controller_unittest.cc",
+    "system/accessibility/select_to_speak_speed_bubble_controller_unittest.cc",
     "system/accessibility/select_to_speak_tray_unittest.cc",
     "system/accessibility/switch_access_back_button_bubble_controller_unittest.cc",
     "system/accessibility/switch_access_menu_bubble_controller_unittest.cc",
     "system/accessibility/tray_accessibility_unittest.cc",
     "system/audio/unified_audio_detailed_view_controller_unittest.cc",
-    "system/bloom/bloom_tray_unittest.cc",
     "system/bluetooth/bluetooth_notification_controller_unittest.cc",
     "system/bluetooth/bluetooth_power_controller_unittest.cc",
     "system/bluetooth/tray_bluetooth_helper_legacy_unittest.cc",
@@ -2168,6 +2251,7 @@ test("ash_unittests") {
     "system/message_center/ash_message_popup_collection_unittest.cc",
     "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/notification_swipe_control_view_unittest.cc",
     "system/message_center/notifier_settings_view_unittest.cc",
     "system/message_center/session_state_notification_blocker_unittest.cc",
@@ -2177,6 +2261,7 @@ test("ash_unittests") {
     "system/nearby_share/nearby_share_feature_pod_controller_unittest.cc",
     "system/network/active_network_icon_unittest.cc",
     "system/network/auto_connect_notifier_unittest.cc",
+    "system/network/cellular_setup_notifier_unittest.cc",
     "system/network/network_icon_unittest.cc",
     "system/network/sms_observer_unittest.cc",
     "system/network/vpn_list_unittest.cc",
@@ -2192,6 +2277,7 @@ test("ash_unittests") {
     "system/palette/tools/create_note_unittest.cc",
     "system/palette/tools/metalayer_unittest.cc",
     "system/palette/tools/screenshot_unittest.cc",
+    "system/pcie_peripheral/pcie_peripheral_notification_controller_unittest.cc",
     "system/phonehub/phone_hub_notification_controller_unittest.cc",
     "system/phonehub/phone_hub_tray_unittest.cc",
     "system/phonehub/phone_hub_ui_controller_unittest.cc",
@@ -2200,6 +2286,8 @@ test("ash_unittests") {
     "system/phonehub/silence_phone_quick_action_controller_unittest.cc",
     "system/phonehub/task_continuation_view_unittest.cc",
     "system/power/backlights_forced_off_setter_unittest.cc",
+    "system/power/peripheral_battery_listener_unittest.cc",
+    "system/power/peripheral_battery_notifier_listener_integration_test.cc",
     "system/power/peripheral_battery_notifier_unittest.cc",
     "system/power/power_button_controller_unittest.cc",
     "system/power/power_button_screenshot_controller_unittest.cc",
@@ -2215,7 +2303,7 @@ test("ash_unittests") {
     "system/session/logout_confirmation_controller_unittest.cc",
     "system/session/session_limit_notification_controller_unittest.cc",
     "system/status_area_widget_unittest.cc",
-    "system/supervised/supervised_notification_controller_unittest.cc",
+    "system/time/time_tray_item_view_unittest.cc",
     "system/time/time_view_unittest.cc",
     "system/toast/toast_manager_unittest.cc",
     "system/tracing_notification_controller_unittest.cc",
@@ -2226,10 +2314,10 @@ test("ash_unittests") {
     "system/unified/camera_mic_tray_item_view_unittest.cc",
     "system/unified/feature_pods_container_view_unittest.cc",
     "system/unified/notification_counter_view_unittest.cc",
+    "system/unified/notification_icons_controller_unittest.cc",
     "system/unified/page_indicator_view_unittest.cc",
     "system/unified/quiet_mode_feature_pod_controller_unittest.cc",
     "system/unified/top_shortcuts_view_unittest.cc",
-    "system/unified/unified_managed_device_view_unittest.cc",
     "system/unified/unified_system_info_view_unittest.cc",
     "system/unified/unified_system_tray_controller_unittest.cc",
     "system/unified/unified_system_tray_unittest.cc",
@@ -2244,6 +2332,7 @@ test("ash_unittests") {
     "tray_action/test_tray_action_client.cc",
     "tray_action/test_tray_action_client.h",
     "tray_action/tray_action_unittest.cc",
+    "utility/layer_util_unittest.cc",
     "utility/screenshot_controller_unittest.cc",
     "wallpaper/wallpaper_controller_unittest.cc",
     "wallpaper/wallpaper_utils/wallpaper_color_calculator_unittest.cc",
@@ -2255,12 +2344,14 @@ test("ash_unittests") {
     "wm/client_controlled_state_unittest.cc",
     "wm/collision_detection/collision_detection_utils_unittest.cc",
     "wm/container_finder_unittest.cc",
+    "wm/cursor_manager_chromeos_unittest.cc",
     "wm/default_window_resizer_unittest.cc",
     "wm/desks/autotest_desks_api_unittests.cc",
     "wm/desks/desk_animation_impl_unittest.cc",
     "wm/desks/desks_unittests.cc",
     "wm/desks/root_window_desk_switch_animator_unittest.cc",
     "wm/drag_window_resizer_unittest.cc",
+    "wm/full_restore/full_restore_controller_unittest.cc",
     "wm/fullscreen_window_finder_unittest.cc",
     "wm/gestures/back_gesture/back_gesture_affordance_unittest.cc",
     "wm/gestures/back_gesture/back_gesture_contextual_nudge_controller_impl_unittest.cc",
@@ -2309,7 +2400,7 @@ test("ash_unittests") {
     "wm/toplevel_window_event_handler_unittest.cc",
     "wm/video_detector_unittest.cc",
     "wm/window_animations_unittest.cc",
-    "wm/window_cycle_controller_unittest.cc",
+    "wm/window_cycle/window_cycle_controller_unittest.cc",
     "wm/window_dimmer_unittest.cc",
     "wm/window_finder_unittest.cc",
     "wm/window_manager_unittest.cc",
@@ -2345,6 +2436,9 @@ test("ash_unittests") {
     "//ash/assistant/ui:constants",
     "//ash/assistant/ui/test_support",
     "//ash/assistant/util",
+    "//ash/components:unit_tests",
+    "//ash/components/audio",
+    "//ash/constants",
     "//ash/keyboard/ui",
     "//ash/keyboard/ui:test_support",
     "//ash/public/cpp",
@@ -2361,34 +2455,30 @@ test("ash_unittests") {
     "//base/util/values:values_util",
     "//build:branding_buildflags",
     "//chromeos:test_support",
-    "//chromeos/strings:strings_grit",
-    "//chromeos/ui/base",
-    "//chromeos/ui/frame",
-    "//chromeos/ui/vector_icons",
-
-    # TODO(https://crbug.com/644336): Make CrasAudioHandler Chrome or Ash only.
-    "//chromeos/audio",
-    "//chromeos/components/bloom/public/cpp",
     "//chromeos/components/phonehub:test_support",
     "//chromeos/components/quick_answers:quick_answers",
-    "//chromeos/constants",
     "//chromeos/dbus:test_support",
     "//chromeos/dbus/audio",
     "//chromeos/dbus/hammerd",
+    "//chromeos/dbus/hermes:hermes_clients",
+    "//chromeos/dbus/hermes:hermes_fakes",
     "//chromeos/dbus/power",
     "//chromeos/dbus/power:power_manager_proto",
     "//chromeos/dbus/services:test_support",
-
-    # TODO(https://crbug.com/644355): Remove Shill dependencies.
     "//chromeos/network:test_support",
     "//chromeos/services/assistant:test_support",
     "//chromeos/services/assistant/public/cpp",
     "//chromeos/services/assistant/public/mojom",
     "//chromeos/services/multidevice_setup/public/cpp:test_support",
     "//chromeos/services/multidevice_setup/public/mojom",
+    "//chromeos/services/nearby/public/cpp",
     "//chromeos/services/network_config/public/mojom",
+    "//chromeos/strings:strings_grit",
     "//chromeos/system",
+    "//chromeos/ui/base",
+    "//chromeos/ui/frame",
     "//chromeos/ui/frame:test_support",
+    "//chromeos/ui/vector_icons",
     "//components/account_id",
     "//components/arc:notification_test_support",
     "//components/media_message_center",
@@ -2396,6 +2486,7 @@ test("ash_unittests") {
     "//components/prefs:test_support",
     "//components/quirks",
     "//components/services/app_service/public/cpp:app_update",
+    "//components/session_manager/core",
     "//components/sync_preferences:test_support",
     "//components/ukm:test_support",
     "//components/user_manager",
@@ -2412,6 +2503,7 @@ test("ash_unittests") {
     "//services/media_session/public/mojom",
     "//services/metrics/public/cpp:ukm_builders",
     "//services/network:test_support",
+    "//services/viz/privileged/mojom/compositing",
     "//skia",
     "//testing/gmock",
     "//testing/gtest",
@@ -2424,7 +2516,7 @@ test("ash_unittests") {
     "//ui/base:test_support",
     "//ui/base/cursor:cursor_base",
     "//ui/base/cursor/mojom:cursor_type",
-    "//ui/base/dragdrop/mojom:mojom_shared",
+    "//ui/base/dragdrop/mojom",
     "//ui/base/ime",
     "//ui/base/ime/chromeos",
     "//ui/chromeos",
@@ -2475,6 +2567,18 @@ test("ash_unittests") {
     "//content/public/browser",
     "//content/public/common",
   ]
+
+  if (use_iioservice) {
+    sources += [
+      "accelerometer/accelerometer_provider_mojo_unittest.cc",
+      "accelerometer/accelerometer_samples_observer_unittest.cc",
+    ]
+    deps += [
+      "//chromeos/components/sensors:sensors",
+      "//chromeos/components/sensors:test_support",
+      "//chromeos/components/sensors/mojom",
+    ]
+  }
 }
 
 # TODO(oshima): Remove or migrate to new ash_ui_perftests
@@ -2511,6 +2615,7 @@ static_library("test_support") {
   public = [
     "public/cpp/holding_space/holding_space_test_api.h",
     "public/cpp/test/accessibility_controller_test_api.h",
+    "public/cpp/test/app_list_test_api.h",
     "public/cpp/test/assistant_test_api.h",
   ]
   sources = [
@@ -2577,7 +2682,10 @@ static_library("test_support") {
     "metrics/task_switch_time_tracker_test_api.h",
     "metrics/user_metrics_recorder_test_api.cc",
     "metrics/user_metrics_recorder_test_api.h",
-    "public/cpp/test/app_list_test_api.h",
+    "projector/test/mock_projector_metadata_controller.cc",
+    "projector/test/mock_projector_metadata_controller.h",
+    "projector/test/mock_projector_ui_controller.cc",
+    "projector/test/mock_projector_ui_controller.h",
     "public/cpp/test/shell_test_api.h",
     "rotator/screen_rotation_animator_test_api.cc",
     "rotator/screen_rotation_animator_test_api.h",
@@ -2620,6 +2728,10 @@ static_library("test_support") {
     "test/ash_test_views_delegate.h",
     "test/fake_android_intent_helper.cc",
     "test/fake_android_intent_helper.h",
+    "test/test_widget_builder.cc",
+    "test/test_widget_builder.h",
+    "test/test_window_builder.cc",
+    "test/test_window_builder.h",
     "test/toplevel_window.cc",
     "test/toplevel_window.h",
     "test/ui_controls_factory_ash.cc",
@@ -2642,8 +2754,6 @@ static_library("test_support") {
     "wm/gestures/back_gesture/test_back_gesture_contextual_nudge_delegate.h",
     "wm/lock_state_controller_test_api.cc",
     "wm/lock_state_controller_test_api.h",
-    "wm/splitview/multi_display_overview_and_split_view_test.cc",
-    "wm/splitview/multi_display_overview_and_split_view_test.h",
     "wm/tablet_mode/tablet_mode_controller_test_api.cc",
     "wm/tablet_mode/tablet_mode_controller_test_api.h",
     "wm/test_activation_delegate.cc",
@@ -2679,6 +2789,10 @@ static_library("test_support") {
     "//ash/app_menu",
     "//ash/assistant/model:model",
     "//ash/assistant/ui:ui",
+    "//ash/components/audio",
+    "//ash/constants",
+    "//ash/keyboard/ui",
+    "//ash/keyboard/ui:test_support",
     "//ash/public/cpp",
     "//ash/public/cpp:test_support",
     "//ash/services/recording/public/mojom",
@@ -2686,27 +2800,16 @@ static_library("test_support") {
     "//base:i18n",
     "//base/test:test_support",
     "//cc:test_support",
-    "//chromeos/services/assistant/public/cpp",
-    "//chromeos/ui/frame",
-    "//ui/accessibility/mojom",
-    "//ui/platform_window/common",
-
-    # TODO(https://crbug.com/644336): Make CrasAudioHandler Chrome or Ash only.
-    "//chromeos/audio",
-    "//chromeos/constants",
     "//chromeos/dbus:test_support",
-
-    # TODO(https://crbug.com/644336): Remove dependencies on CrasAudioClient.
     "//chromeos/dbus/audio",
     "//chromeos/dbus/power",
     "//chromeos/dbus/power:power_manager_proto",
     "//chromeos/dbus/system_clock",
-
-    # TODO(https://crbug.com/644355): Remove Shill dependencies.
-    "//ash/keyboard/ui",
-    "//ash/keyboard/ui:test_support",
+    "//chromeos/login/login_state",
     "//chromeos/network:test_support",
+    "//chromeos/services/assistant/public/cpp",
     "//chromeos/system",
+    "//chromeos/ui/frame",
     "//components/account_id",
     "//components/prefs:test_support",
     "//components/user_manager:user_manager",
@@ -2717,6 +2820,7 @@ static_library("test_support") {
     "//skia",
     "//testing/gtest",
     "//ui/accessibility",
+    "//ui/accessibility/mojom",
     "//ui/aura",
     "//ui/aura:test_support",
     "//ui/base:test_support",
@@ -2732,6 +2836,7 @@ static_library("test_support") {
     "//ui/gl:test_support",
     "//ui/message_center",
     "//ui/message_center/public/cpp",
+    "//ui/platform_window/common",
     "//ui/views",
     "//ui/views:test_support",
     "//ui/wm",