BASELINE: Update Chromium to 91.0.4472.160

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

1 files changed, 135 insertions, 123 deletions

diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn
index bf0b085268a..717d56c51e2 100644
--- a/chromium/ash/BUILD.gn
+++ b/chromium/ash/BUILD.gn
@@ -25,6 +25,7 @@ component("ash") {
   # All targets in this file are allowed to access any the headers in ash.
   friend = [
     ":*",
+    "//ash/app_list:*",
     "//components/exo:*",
     "//components/exo/wayland:*",
   ]
@@ -35,14 +36,15 @@ component("ash") {
     # TODO: move the following to source. Do NOT add new files here.
     "accessibility/accessibility_controller_impl.h",
     "accessibility/accessibility_delegate.h",
-    "accessibility/focus_ring_controller.h",
+    "accessibility/magnifier/magnification_controller.h",
+    "accessibility/sticky_keys/sticky_keys_controller.h",
+    "accessibility/ui/focus_ring_controller.h",
     "display/output_protection_delegate.h",
     "display/privacy_screen_controller.h",
     "display/screen_orientation_controller.h",
     "frame/header_view.h",
     "frame/non_client_frame_view_ash.h",
     "frame/wide_frame_view.h",
-    "magnifier/magnification_controller.h",
 
     # TODO: move MultiUserWindowManager (and delegate) to sources:
     # https://crbug.com/756085
@@ -77,7 +79,6 @@ component("ash") {
     "shell_delegate.h",
     "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",
@@ -110,10 +111,10 @@ component("ash") {
   sources = [
     "accelerators/accelerator_commands.cc",
     "accelerators/accelerator_commands.h",
-    "accelerators/accelerator_confirmation_dialog.cc",
-    "accelerators/accelerator_confirmation_dialog.h",
     "accelerators/accelerator_controller_impl.cc",
     "accelerators/accelerator_controller_impl.h",
+    "accelerators/accelerator_history_impl.cc",
+    "accelerators/accelerator_history_impl.h",
     "accelerators/accelerator_ids.h",
     "accelerators/accelerator_table.cc",
     "accelerators/accelerator_table.h",
@@ -139,48 +140,72 @@ component("ash") {
     "accelerometer/accelerometer_types.cc",
     "accelerometer/accelerometer_types.h",
     "accessibility/accessibility_controller_impl.cc",
-    "accessibility/accessibility_cursor_ring_layer.cc",
-    "accessibility/accessibility_cursor_ring_layer.h",
-    "accessibility/accessibility_focus_ring.cc",
-    "accessibility/accessibility_focus_ring.h",
-    "accessibility/accessibility_focus_ring_controller_impl.cc",
-    "accessibility/accessibility_focus_ring_controller_impl.h",
-    "accessibility/accessibility_focus_ring_group.cc",
-    "accessibility/accessibility_focus_ring_group.h",
-    "accessibility/accessibility_focus_ring_layer.cc",
-    "accessibility/accessibility_focus_ring_layer.h",
-    "accessibility/accessibility_highlight_controller.cc",
-    "accessibility/accessibility_highlight_controller.h",
-    "accessibility/accessibility_highlight_layer.cc",
-    "accessibility/accessibility_highlight_layer.h",
-    "accessibility/accessibility_layer.cc",
-    "accessibility/accessibility_layer.h",
     "accessibility/accessibility_observer.h",
-    "accessibility/accessibility_panel_layout_manager.cc",
-    "accessibility/accessibility_panel_layout_manager.h",
+    "accessibility/autoclick/autoclick_controller.cc",
+    "accessibility/autoclick/autoclick_controller.h",
+    "accessibility/autoclick/autoclick_drag_event_rewriter.cc",
+    "accessibility/autoclick/autoclick_drag_event_rewriter.h",
+    "accessibility/autoclick/autoclick_ring_handler.cc",
+    "accessibility/autoclick/autoclick_ring_handler.h",
+    "accessibility/autoclick/autoclick_scroll_position_handler.cc",
+    "accessibility/autoclick/autoclick_scroll_position_handler.h",
+    "accessibility/chromevox/key_accessibility_enabler.cc",
+    "accessibility/chromevox/key_accessibility_enabler.h",
+    "accessibility/chromevox/spoken_feedback_enabler.cc",
+    "accessibility/chromevox/spoken_feedback_enabler.h",
+    "accessibility/chromevox/touch_accessibility_enabler.cc",
+    "accessibility/chromevox/touch_accessibility_enabler.h",
+    "accessibility/chromevox/touch_exploration_controller.cc",
+    "accessibility/chromevox/touch_exploration_controller.h",
+    "accessibility/chromevox/touch_exploration_manager.cc",
+    "accessibility/chromevox/touch_exploration_manager.h",
     "accessibility/default_accessibility_delegate.cc",
     "accessibility/default_accessibility_delegate.h",
-    "accessibility/focus_ring_controller.cc",
-    "accessibility/focus_ring_layer.cc",
-    "accessibility/focus_ring_layer.h",
-    "accessibility/key_accessibility_enabler.cc",
-    "accessibility/key_accessibility_enabler.h",
-    "accessibility/layer_animation_info.cc",
-    "accessibility/layer_animation_info.h",
-    "accessibility/point_scan_controller.cc",
-    "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",
-    "accessibility/touch_accessibility_enabler.h",
-    "accessibility/touch_exploration_controller.cc",
-    "accessibility/touch_exploration_controller.h",
-    "accessibility/touch_exploration_manager.cc",
-    "accessibility/touch_exploration_manager.h",
+    "accessibility/magnifier/docked_magnifier_controller_impl.cc",
+    "accessibility/magnifier/docked_magnifier_controller_impl.h",
+    "accessibility/magnifier/magnification_controller.cc",
+    "accessibility/magnifier/magnification_controller.h",
+    "accessibility/magnifier/magnifier_glass.cc",
+    "accessibility/magnifier/magnifier_glass.h",
+    "accessibility/magnifier/magnifier_utils.cc",
+    "accessibility/magnifier/magnifier_utils.h",
+    "accessibility/magnifier/partial_magnification_controller.cc",
+    "accessibility/magnifier/partial_magnification_controller.h",
+    "accessibility/sticky_keys/sticky_keys_controller.cc",
+    "accessibility/sticky_keys/sticky_keys_overlay.cc",
+    "accessibility/sticky_keys/sticky_keys_overlay.h",
+    "accessibility/sticky_keys/sticky_keys_state.h",
+    "accessibility/switch_access/point_scan_controller.cc",
+    "accessibility/switch_access/point_scan_controller.h",
+    "accessibility/switch_access/point_scan_layer.cc",
+    "accessibility/switch_access/point_scan_layer.h",
+    "accessibility/switch_access/point_scan_layer_animation_info.cc",
+    "accessibility/switch_access/point_scan_layer_animation_info.h",
+    "accessibility/ui/accessibility_confirmation_dialog.cc",
+    "accessibility/ui/accessibility_confirmation_dialog.h",
+    "accessibility/ui/accessibility_cursor_ring_layer.cc",
+    "accessibility/ui/accessibility_cursor_ring_layer.h",
+    "accessibility/ui/accessibility_focus_ring.cc",
+    "accessibility/ui/accessibility_focus_ring.h",
+    "accessibility/ui/accessibility_focus_ring_controller_impl.cc",
+    "accessibility/ui/accessibility_focus_ring_controller_impl.h",
+    "accessibility/ui/accessibility_focus_ring_group.cc",
+    "accessibility/ui/accessibility_focus_ring_group.h",
+    "accessibility/ui/accessibility_focus_ring_layer.cc",
+    "accessibility/ui/accessibility_focus_ring_layer.h",
+    "accessibility/ui/accessibility_highlight_controller.cc",
+    "accessibility/ui/accessibility_highlight_controller.h",
+    "accessibility/ui/accessibility_highlight_layer.cc",
+    "accessibility/ui/accessibility_highlight_layer.h",
+    "accessibility/ui/accessibility_layer.cc",
+    "accessibility/ui/accessibility_layer.h",
+    "accessibility/ui/accessibility_panel_layout_manager.cc",
+    "accessibility/ui/accessibility_panel_layout_manager.h",
+    "accessibility/ui/focus_ring_controller.cc",
+    "accessibility/ui/focus_ring_layer.cc",
+    "accessibility/ui/focus_ring_layer.h",
+    "accessibility/ui/layer_animation_info.cc",
+    "accessibility/ui/layer_animation_info.h",
     "ambient/ambient_access_token_controller.cc",
     "ambient/ambient_access_token_controller.h",
     "ambient/ambient_constants.h",
@@ -215,12 +240,6 @@ component("ash") {
     "ambient/util/ambient_util.cc",
     "ambient/util/ambient_util.h",
     "animation/animation_change_type.h",
-    "app_list/app_list_color_provider_impl.cc",
-    "app_list/app_list_color_provider_impl.h",
-    "app_list/app_list_controller_impl.cc",
-    "app_list/app_list_controller_impl.h",
-    "app_list/app_list_presenter_delegate_impl.cc",
-    "app_list/app_list_presenter_delegate_impl.h",
     "ash_export.h",
     "ash_interfaces.cc",
     "ash_prefs.cc",
@@ -250,14 +269,6 @@ component("ash") {
     "assistant/assistant_web_ui_controller.h",
     "assistant/assistant_web_view_delegate_impl.cc",
     "assistant/assistant_web_view_delegate_impl.h",
-    "autoclick/autoclick_controller.cc",
-    "autoclick/autoclick_controller.h",
-    "autoclick/autoclick_drag_event_rewriter.cc",
-    "autoclick/autoclick_drag_event_rewriter.h",
-    "autoclick/autoclick_ring_handler.cc",
-    "autoclick/autoclick_ring_handler.h",
-    "autoclick/autoclick_scroll_position_handler.cc",
-    "autoclick/autoclick_scroll_position_handler.h",
     "autotest_private_api_utils.cc",
     "bluetooth_devices_observer.cc",
     "bluetooth_devices_observer.h",
@@ -491,17 +502,6 @@ component("ash") {
     "highlighter/highlighter_result_view.h",
     "highlighter/highlighter_view.cc",
     "highlighter/highlighter_view.h",
-    "home_screen/drag_window_from_shelf_controller.cc",
-    "home_screen/drag_window_from_shelf_controller.h",
-    "home_screen/home_screen_controller.cc",
-    "home_screen/home_screen_controller.h",
-    "home_screen/home_screen_delegate.h",
-    "home_screen/home_screen_presenter.cc",
-    "home_screen/home_screen_presenter.h",
-    "home_screen/swipe_home_to_overview_controller.cc",
-    "home_screen/swipe_home_to_overview_controller.h",
-    "home_screen/window_scale_animation.cc",
-    "home_screen/window_scale_animation.h",
     "host/ash_window_tree_host.cc",
     "host/ash_window_tree_host.h",
     "host/ash_window_tree_host_init_params.h",
@@ -673,16 +673,8 @@ component("ash") {
     "login/ui/views_utils.cc",
     "login/ui/views_utils.h",
     "login_status.h",
-    "magnifier/docked_magnifier_controller_impl.cc",
-    "magnifier/docked_magnifier_controller_impl.h",
-    "magnifier/magnification_controller.cc",
-    "magnifier/magnification_controller.h",
-    "magnifier/magnifier_glass.cc",
-    "magnifier/magnifier_glass.h",
-    "magnifier/magnifier_utils.cc",
-    "magnifier/magnifier_utils.h",
-    "magnifier/partial_magnification_controller.cc",
-    "magnifier/partial_magnification_controller.h",
+    "marker/marker_controller.cc",
+    "marker/marker_controller.h",
     "media/media_controller_impl.cc",
     "media/media_controller_impl.h",
     "media/media_notification_constants.cc",
@@ -723,6 +715,8 @@ component("ash") {
     "policy/policy_recommendation_restorer.h",
     "power/hid_battery_util.cc",
     "power/hid_battery_util.h",
+    "projector/model/projector_session_impl.cc",
+    "projector/model/projector_session_impl.h",
     "projector/model/projector_ui_model.cc",
     "projector/model/projector_ui_model.h",
     "projector/projector_controller_impl.cc",
@@ -796,6 +790,8 @@ component("ash") {
     "shelf/contextual_tooltip.h",
     "shelf/drag_handle.cc",
     "shelf/drag_handle.h",
+    "shelf/drag_window_from_shelf_controller.cc",
+    "shelf/drag_window_from_shelf_controller.h",
     "shelf/gradient_layer_delegate.cc",
     "shelf/gradient_layer_delegate.h",
     "shelf/home_button.cc",
@@ -874,8 +870,12 @@ component("ash") {
     "shelf/shelf_window_watcher.h",
     "shelf/shelf_window_watcher_item_delegate.cc",
     "shelf/shelf_window_watcher_item_delegate.h",
+    "shelf/swipe_home_to_overview_controller.cc",
+    "shelf/swipe_home_to_overview_controller.h",
     "shelf/window_preview.cc",
     "shelf/window_preview.h",
+    "shelf/window_scale_animation.cc",
+    "shelf/window_scale_animation.h",
     "shell.cc",
     "shell_delegate.cc",
     "shell_init_params.cc",
@@ -885,10 +885,6 @@ component("ash") {
     "shutdown_controller_impl.h",
     "shutdown_reason.cc",
     "shutdown_reason.h",
-    "sticky_keys/sticky_keys_controller.cc",
-    "sticky_keys/sticky_keys_overlay.cc",
-    "sticky_keys/sticky_keys_overlay.h",
-    "sticky_keys/sticky_keys_state.h",
     "style/ash_color_provider.cc",
     "style/ash_color_provider.h",
     "style/default_color_constants.h",
@@ -1475,8 +1471,12 @@ component("ash") {
     "tray_action/tray_action.cc",
     "tray_action/tray_action.h",
     "tray_action/tray_action_observer.h",
+    "utility/layer_copy_animator.cc",
+    "utility/layer_copy_animator.h",
     "utility/layer_util.cc",
     "utility/layer_util.h",
+    "utility/occlusion_tracker_pauser.cc",
+    "utility/occlusion_tracker_pauser.h",
     "utility/screenshot_controller.cc",
     "utility/screenshot_controller.h",
     "utility/transformer_util.cc",
@@ -1793,6 +1793,7 @@ component("ash") {
     "//ui/base/cursor",
     "//ui/base/cursor:cursor_base",
     "//ui/base/cursor/mojom:cursor_type",
+    "//ui/base/dragdrop:types",
     "//ui/base/dragdrop/mojom:mojom_shared",
     "//ui/events",
     "//ui/gfx",
@@ -1837,6 +1838,8 @@ component("ash") {
     "//chromeos/dbus/audio",
     "//chromeos/dbus/constants",
     "//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:services",
@@ -1847,6 +1850,7 @@ component("ash") {
     "//chromeos/services/assistant/public/cpp",
     "//chromeos/services/assistant/public/mojom",
     "//chromeos/services/libassistant/public/cpp:structs",
+    "//chromeos/services/libassistant/public/mojom",
     "//chromeos/services/multidevice_setup/public/mojom",
     "//chromeos/services/nearby/public/cpp",
     "//chromeos/services/network_config/public/cpp",
@@ -1947,7 +1951,10 @@ component("ash") {
     "//ui/base/idle",
   ]
 
-  allow_circular_includes_from = [ "//ash/assistant/ui" ]
+  allow_circular_includes_from = [
+    "//ash/app_list",
+    "//ash/assistant/ui",
+  ]
 
   if (enable_cros_ambient_mode_backend) {
     sources += [
@@ -2003,22 +2010,33 @@ test("ash_unittests") {
     "accelerators/accelerator_commands_unittest.cc",
     "accelerators/accelerator_controller_unittest.cc",
     "accelerators/accelerator_filter_unittest.cc",
+    "accelerators/accelerator_history_unittest.cc",
     "accelerators/accelerator_table_unittest.cc",
     "accelerators/accelerator_unittest.cc",
     "accelerators/magnifier_key_scroller_unittest.cc",
     "accelerators/spoken_feedback_toggler_unittest.cc",
     "accessibility/accessibility_controller_unittest.cc",
-    "accessibility/accessibility_focus_ring_controller_unittest.cc",
-    "accessibility/accessibility_focus_ring_group_unittest.cc",
-    "accessibility/accessibility_highlight_controller_unittest.cc",
-    "accessibility/accessibility_panel_layout_manager_unittest.cc",
-    "accessibility/key_accessibility_enabler_unittest.cc",
-    "accessibility/mock_touch_exploration_controller_delegate.cc",
-    "accessibility/mock_touch_exploration_controller_delegate.h",
-    "accessibility/point_scan_controller_unittest.cc",
-    "accessibility/touch_accessibility_enabler_unittest.cc",
-    "accessibility/touch_exploration_controller_unittest.cc",
-    "accessibility/touch_exploration_manager_unittest.cc",
+    "accessibility/autoclick/autoclick_drag_event_rewriter_unittest.cc",
+    "accessibility/autoclick/autoclick_unittest.cc",
+    "accessibility/chromevox/key_accessibility_enabler_unittest.cc",
+    "accessibility/chromevox/mock_touch_exploration_controller_delegate.cc",
+    "accessibility/chromevox/mock_touch_exploration_controller_delegate.h",
+    "accessibility/chromevox/touch_accessibility_enabler_unittest.cc",
+    "accessibility/chromevox/touch_exploration_controller_unittest.cc",
+    "accessibility/chromevox/touch_exploration_manager_unittest.cc",
+    "accessibility/magnifier/docked_magnifier_controller_impl_unittest.cc",
+    "accessibility/magnifier/magnification_controller_unittest.cc",
+    "accessibility/magnifier/magnifier_test_utils.cc",
+    "accessibility/magnifier/magnifier_test_utils.h",
+    "accessibility/magnifier/magnifier_utils_unittest.cc",
+    "accessibility/magnifier/partial_magnification_controller_unittest.cc",
+    "accessibility/sticky_keys/sticky_keys_overlay_unittest.cc",
+    "accessibility/sticky_keys/sticky_keys_unittest.cc",
+    "accessibility/switch_access/point_scan_controller_unittest.cc",
+    "accessibility/ui/accessibility_focus_ring_controller_unittest.cc",
+    "accessibility/ui/accessibility_focus_ring_group_unittest.cc",
+    "accessibility/ui/accessibility_highlight_controller_unittest.cc",
+    "accessibility/ui/accessibility_panel_layout_manager_unittest.cc",
     "ambient/ambient_controller_unittest.cc",
     "ambient/ambient_photo_cache_unittest.cc",
     "ambient/ambient_photo_controller_unittest.cc",
@@ -2027,14 +2045,6 @@ test("ash_unittests") {
     "ambient/ui/ambient_container_view_unittest.cc",
     "ambient/ui/media_string_view_unittest.cc",
     "ambient/ui/photo_view_unittest.cc",
-    "app_list/app_list_controller_impl_unittest.cc",
-    "app_list/app_list_metrics_unittest.cc",
-    "app_list/app_list_presenter_delegate_unittest.cc",
-    "app_list/app_list_presenter_impl_unittest.cc",
-    "app_list/app_list_unittest.cc",
-    "app_list/model/app_list_item_list_unittest.cc",
-    "app_list/model/app_list_model_unittest.cc",
-    "app_list/views/assistant/assistant_page_view_unittest.cc",
     "app_menu/notification_menu_controller_unittest.cc",
     "app_menu/notification_menu_view_unittest.cc",
     "app_menu/notification_overflow_view_unittest.cc",
@@ -2052,8 +2062,6 @@ test("ash_unittests") {
     "assistant/ui/main_stage/suggestion_chip_view_unittest.cc",
     "assistant/util/deep_link_util_unittest.cc",
     "assistant/util/resource_util_unittest.cc",
-    "autoclick/autoclick_drag_event_rewriter_unittest.cc",
-    "autoclick/autoclick_unittest.cc",
     "capture_mode/capture_mode_unittests.cc",
     "capture_mode/video_file_handler_unittest.cc",
     "child_accounts/parent_access_controller_impl_unittest.cc",
@@ -2113,11 +2121,6 @@ test("ash_unittests") {
     "frame/non_client_frame_view_ash_unittest.cc",
     "highlighter/highlighter_controller_unittest.cc",
     "highlighter/highlighter_gesture_util_unittest.cc",
-    "home_screen/drag_window_from_shelf_controller_test_api.cc",
-    "home_screen/drag_window_from_shelf_controller_test_api.h",
-    "home_screen/drag_window_from_shelf_controller_unittest.cc",
-    "home_screen/home_screen_controller_unittest.cc",
-    "home_screen/swipe_home_to_overview_controller_unittest.cc",
     "host/ash_window_tree_host_platform_unittest.cc",
     "ime/ime_controller_impl_unittest.cc",
     "in_session_auth/in_session_auth_dialog_controller_impl_unittest.cc",
@@ -2158,12 +2161,7 @@ test("ash_unittests") {
     "login/ui/note_action_launch_button_unittest.cc",
     "login/ui/pin_request_view_unittest.cc",
     "login/ui/views_utils_unittest.cc",
-    "magnifier/docked_magnifier_controller_impl_unittest.cc",
-    "magnifier/magnification_controller_unittest.cc",
-    "magnifier/magnifier_test_utils.cc",
-    "magnifier/magnifier_test_utils.h",
-    "magnifier/magnifier_utils_unittest.cc",
-    "magnifier/partial_magnification_controller_unittest.cc",
+    "marker/marker_controller_unittest.cc",
     "media/media_controller_unittest.cc",
     "media/media_notification_controller_impl_unittest.cc",
     "metrics/demo_session_metrics_recorder_unittest.cc",
@@ -2178,8 +2176,10 @@ test("ash_unittests") {
     "multi_device_setup/multi_device_notification_presenter_unittest.cc",
     "policy/policy_recommendation_restorer_unittest.cc",
     "power/hid_battery_util_unittest.cc",
+    "projector/model/projector_session_impl_unittest.cc",
     "projector/projector_controller_unittest.cc",
     "projector/projector_metadata_model_unittest.cc",
+    "projector/projector_ui_controller_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",
@@ -2191,6 +2191,9 @@ test("ash_unittests") {
     "shelf/back_button_unittest.cc",
     "shelf/contextual_tooltip_unittest.cc",
     "shelf/drag_handle_unittest.cc",
+    "shelf/drag_window_from_shelf_controller_test_api.cc",
+    "shelf/drag_window_from_shelf_controller_test_api.h",
+    "shelf/drag_window_from_shelf_controller_unittest.cc",
     "shelf/home_button_unittest.cc",
     "shelf/home_to_overview_nudge_controller_unittest.cc",
     "shelf/hotseat_widget_unittest.cc",
@@ -2206,13 +2209,12 @@ test("ash_unittests") {
     "shelf/shelf_drag_handle_unittest.cc",
     "shelf/shelf_layout_manager_unittest.cc",
     "shelf/shelf_locking_manager_unittest.cc",
-    "shelf/shelf_test_util.cc",
-    "shelf/shelf_test_util.h",
     "shelf/shelf_tooltip_manager_unittest.cc",
     "shelf/shelf_unittest.cc",
     "shelf/shelf_view_unittest.cc",
     "shelf/shelf_widget_unittest.cc",
     "shelf/shelf_window_watcher_unittest.cc",
+    "shelf/swipe_home_to_overview_controller_unittest.cc",
     "shelf/test/hotseat_state_watcher.cc",
     "shelf/test/hotseat_state_watcher.h",
     "shelf/test/shelf_layout_manager_test_base.cc",
@@ -2220,8 +2222,6 @@ test("ash_unittests") {
     "shelf/test/widget_animation_smoothness_inspector.cc",
     "shelf/test/widget_animation_smoothness_inspector.h",
     "shell_unittest.cc",
-    "sticky_keys/sticky_keys_overlay_unittest.cc",
-    "sticky_keys/sticky_keys_unittest.cc",
     "system/accessibility/accessibility_feature_pod_controller_unittest.cc",
     "system/accessibility/autoclick_menu_bubble_controller_unittest.cc",
     "system/accessibility/dictation_button_tray_unittest.cc",
@@ -2309,6 +2309,7 @@ test("ash_unittests") {
     "system/tracing_notification_controller_unittest.cc",
     "system/tray/size_range_layout_unittest.cc",
     "system/tray/status_area_overflow_button_tray_unittest.cc",
+    "system/tray/tray_background_view_unittest.cc",
     "system/tray/tray_event_filter_unittest.cc",
     "system/tray/tri_view_unittest.cc",
     "system/unified/camera_mic_tray_item_view_unittest.cc",
@@ -2332,7 +2333,9 @@ 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_copy_animator_unittest.cc",
     "utility/layer_util_unittest.cc",
+    "utility/occlusion_tracker_pauser_unittest.cc",
     "utility/screenshot_controller_unittest.cc",
     "wallpaper/wallpaper_controller_unittest.cc",
     "wallpaper/wallpaper_utils/wallpaper_color_calculator_unittest.cc",
@@ -2430,10 +2433,12 @@ test("ash_unittests") {
     ":test_support",
     "//ash/app_list",
     "//ash/app_list:test_support",
+    "//ash/app_list:unit_tests",
     "//ash/app_menu",
     "//ash/assistant/model",
     "//ash/assistant/ui",
-    "//ash/assistant/ui:constants",
+
+    ###"//ash/assistant/ui:constants",
     "//ash/assistant/ui/test_support",
     "//ash/assistant/util",
     "//ash/components:unit_tests",
@@ -2481,6 +2486,7 @@ test("ash_unittests") {
     "//chromeos/ui/vector_icons",
     "//components/account_id",
     "//components/arc:notification_test_support",
+    "//components/full_restore",
     "//components/media_message_center",
     "//components/password_manager/core/browser:hash_password_manager",
     "//components/prefs:test_support",
@@ -2516,6 +2522,7 @@ test("ash_unittests") {
     "//ui/base:test_support",
     "//ui/base/cursor:cursor_base",
     "//ui/base/cursor/mojom:cursor_type",
+    "//ui/base/dragdrop:types",
     "//ui/base/dragdrop/mojom",
     "//ui/base/ime",
     "//ui/base/ime/chromeos",
@@ -2607,6 +2614,7 @@ static_library("test_support") {
   testonly = true
   friend = [
     ":*",
+    "//ash/app_list:*",
     "//ash/shortcut_viewer:*",
     "//components/exo:*",
     "//components/exo/wayland:*",
@@ -2632,8 +2640,8 @@ static_library("test_support") {
     "app_list/app_list_test_api.cc",
     "app_list/test/app_list_test_helper.cc",
     "app_list/test/app_list_test_helper.h",
-    "app_list/test/test_app_list_client.cc",
-    "app_list/test/test_app_list_client.h",
+    "app_list/test_app_list_client.cc",
+    "app_list/test_app_list_client.h",
     "app_list/views/assistant/assistant_test_api_impl.cc",
     "app_list/views/assistant/assistant_test_api_impl.h",
     "app_menu/notification_menu_view_test_api.cc",
@@ -2678,6 +2686,8 @@ static_library("test_support") {
     "lock_screen_action/test_lock_screen_action_background_controller.cc",
     "lock_screen_action/test_lock_screen_action_background_controller.h",
     "login/login_screen_test_api.cc",
+    "marker/marker_controller_test_api.cc",
+    "marker/marker_controller_test_api.h",
     "metrics/task_switch_time_tracker_test_api.cc",
     "metrics/task_switch_time_tracker_test_api.h",
     "metrics/user_metrics_recorder_test_api.cc",
@@ -2697,6 +2707,8 @@ static_library("test_support") {
     "shelf/shelf_button_pressed_metric_tracker_test_api.h",
     "shelf/shelf_focus_cycler.cc",
     "shelf/shelf_focus_cycler.h",
+    "shelf/shelf_test_util.cc",
+    "shelf/shelf_test_util.h",
     "shelf/shelf_view_test_api.cc",
     "shelf/shelf_view_test_api.h",
     "shelf/test/widget_animation_waiter.cc",