BASELINE: Update Chromium to 71.0.3578.93

Change-Id: I6a32086c33670e1b033f8b10e6bf1fd4da1d105d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 108 insertions, 79 deletions

diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn
index c1f7df74499..d130455d8a8 100644
--- a/chromium/ash/BUILD.gn
+++ b/chromium/ash/BUILD.gn
@@ -42,11 +42,7 @@ component("ash") {
     "display/screen_orientation_controller.h",
     "events/event_rewriter_controller.h",
     "focus_cycler.h",
-    "frame/caption_buttons/frame_back_button.h",
-    "frame/caption_buttons/frame_caption_button_container_view.h",
-    "frame/custom_frame_header.h",
-    "frame/default_frame_header.h",
-    "frame/frame_header_util.h",
+    "frame/ash_frame_caption_controller.h",
     "frame/header_view.h",
     "frame/non_client_frame_view_ash.h",
     "frame/wide_frame_view.h",
@@ -75,9 +71,9 @@ component("ash") {
     "wm/mru_window_tracker.h",
     "wm/overview/window_selector_controller.h",
     "wm/splitview/split_view_controller.h",
-    "wm/tablet_mode/tablet_mode_app_window_drag_controller.h",
     "wm/tablet_mode/tablet_mode_controller.h",
     "wm/tablet_mode/tablet_mode_observer.h",
+    "wm/tablet_mode/tablet_mode_window_drag_delegate.h",
     "wm/window_finder.h",
     "wm/window_positioner.h",
     "wm/window_positioning_utils.h",
@@ -96,11 +92,7 @@ component("ash") {
     "accelerators/accelerator_confirmation_dialog.cc",
     "accelerators/accelerator_confirmation_dialog.h",
     "accelerators/accelerator_controller.cc",
-    "accelerators/accelerator_delegate.cc",
-    "accelerators/accelerator_delegate.h",
     "accelerators/accelerator_ids.h",
-    "accelerators/accelerator_router.cc",
-    "accelerators/accelerator_router.h",
     "accelerators/accelerator_table.cc",
     "accelerators/accelerator_table.h",
     "accelerators/ash_focus_manager_factory.cc",
@@ -113,6 +105,8 @@ component("ash") {
     "accelerators/key_hold_detector.h",
     "accelerators/magnifier_key_scroller.cc",
     "accelerators/magnifier_key_scroller.h",
+    "accelerators/pre_target_accelerator_handler.cc",
+    "accelerators/pre_target_accelerator_handler.h",
     "accelerators/spoken_feedback_toggler.cc",
     "accelerators/spoken_feedback_toggler.h",
     "accessibility/accessibility_controller.cc",
@@ -169,6 +163,8 @@ component("ash") {
     "assistant/assistant_interaction_controller.h",
     "assistant/assistant_notification_controller.cc",
     "assistant/assistant_notification_controller.h",
+    "assistant/assistant_response_processor.cc",
+    "assistant/assistant_response_processor.h",
     "assistant/assistant_screen_context_controller.cc",
     "assistant/assistant_screen_context_controller.h",
     "assistant/assistant_setup_controller.cc",
@@ -185,23 +181,35 @@ component("ash") {
     "assistant/model/assistant_query.h",
     "assistant/model/assistant_response.cc",
     "assistant/model/assistant_response.h",
+    "assistant/model/assistant_response_observer.h",
     "assistant/model/assistant_screen_context_model.cc",
     "assistant/model/assistant_screen_context_model.h",
     "assistant/model/assistant_screen_context_model_observer.h",
+    "assistant/model/assistant_ui_element.cc",
     "assistant/model/assistant_ui_element.h",
     "assistant/model/assistant_ui_model.cc",
     "assistant/model/assistant_ui_model.h",
     "assistant/model/assistant_ui_model_observer.h",
+    "assistant/ui/assistant_background_layer.cc",
+    "assistant/ui/assistant_background_layer.h",
     "assistant/ui/assistant_container_view.cc",
     "assistant/ui/assistant_container_view.h",
+    "assistant/ui/assistant_container_view_animator.cc",
+    "assistant/ui/assistant_container_view_animator.h",
+    "assistant/ui/assistant_container_view_animator_legacy_impl.cc",
+    "assistant/ui/assistant_container_view_animator_legacy_impl.h",
+    "assistant/ui/assistant_container_view_focus_traversable.cc",
+    "assistant/ui/assistant_container_view_focus_traversable.h",
     "assistant/ui/assistant_main_view.cc",
     "assistant/ui/assistant_main_view.h",
     "assistant/ui/assistant_mini_view.cc",
     "assistant/ui/assistant_mini_view.h",
-    "assistant/ui/assistant_scroll_view.cc",
-    "assistant/ui/assistant_scroll_view.h",
     "assistant/ui/assistant_web_view.cc",
     "assistant/ui/assistant_web_view.h",
+    "assistant/ui/base/assistant_button.cc",
+    "assistant/ui/base/assistant_button.h",
+    "assistant/ui/base/assistant_scroll_view.cc",
+    "assistant/ui/base/assistant_scroll_view.h",
     "assistant/ui/caption_bar.cc",
     "assistant/ui/caption_bar.h",
     "assistant/ui/dialog_plate/action_view.cc",
@@ -234,16 +242,18 @@ component("ash") {
     "assistant/util/assistant_util.h",
     "assistant/util/deep_link_util.cc",
     "assistant/util/deep_link_util.h",
+    "assistant/util/histogram_util.cc",
+    "assistant/util/histogram_util.h",
     "assistant/util/views_util.cc",
     "assistant/util/views_util.h",
     "autoclick/autoclick_controller.cc",
     "autoclick/autoclick_controller.h",
+    "bluetooth_devices_observer.cc",
+    "bluetooth_devices_observer.h",
     "cancel_mode.cc",
     "cancel_mode.h",
     "cast_config_controller.cc",
     "cast_config_controller.h",
-    "client_image_registry.cc",
-    "client_image_registry.h",
     "dbus/ash_dbus_services.cc",
     "dbus/ash_dbus_services.h",
     "dbus/display_service_provider.cc",
@@ -332,6 +342,8 @@ component("ash") {
     "events/event_rewriter_controller.cc",
     "events/keyboard_driven_event_rewriter.cc",
     "events/keyboard_driven_event_rewriter.h",
+    "events/select_to_speak_event_handler.cc",
+    "events/select_to_speak_event_handler.h",
     "events/spoken_feedback_event_rewriter.cc",
     "events/spoken_feedback_event_rewriter.h",
     "first_run/desktop_cleaner.cc",
@@ -339,21 +351,7 @@ component("ash") {
     "first_run/first_run_helper.cc",
     "first_run/first_run_helper.h",
     "focus_cycler.cc",
-    "frame/caption_buttons/caption_button_types.h",
-    "frame/caption_buttons/frame_back_button.cc",
-    "frame/caption_buttons/frame_caption_button.cc",
-    "frame/caption_buttons/frame_caption_button.h",
-    "frame/caption_buttons/frame_caption_button_container_view.cc",
-    "frame/caption_buttons/frame_size_button.cc",
-    "frame/caption_buttons/frame_size_button.h",
-    "frame/caption_buttons/frame_size_button_delegate.h",
-    "frame/custom_frame_header.cc",
-    "frame/default_frame_header.cc",
-    "frame/detached_title_area_renderer.cc",
-    "frame/detached_title_area_renderer.h",
-    "frame/frame_header.cc",
-    "frame/frame_header.h",
-    "frame/frame_header_util.cc",
+    "frame/ash_frame_caption_controller.cc",
     "frame/header_view.cc",
     "frame/non_client_frame_view_ash.cc",
     "frame/wide_frame_view.cc",
@@ -389,10 +387,13 @@ component("ash") {
     "ime/ime_switch_type.h",
     "ime/mode_indicator_observer.cc",
     "ime/mode_indicator_observer.h",
+    "keyboard/ash_keyboard_controller.cc",
+    "keyboard/ash_keyboard_controller.h",
     "keyboard/virtual_keyboard_container_layout_manager.cc",
     "keyboard/virtual_keyboard_container_layout_manager.h",
     "keyboard/virtual_keyboard_controller.cc",
     "keyboard/virtual_keyboard_controller.h",
+    "keyboard/virtual_keyboard_controller_observer.h",
     "laser/laser_pointer_controller.cc",
     "laser/laser_pointer_controller.h",
     "laser/laser_pointer_view.cc",
@@ -485,33 +486,10 @@ component("ash") {
     "magnifier/partial_magnification_controller.h",
     "media_controller.cc",
     "media_controller.h",
-    "message_center/arc_notification_manager_delegate_impl.cc",
-    "message_center/arc_notification_manager_delegate_impl.h",
-    "message_center/ash_message_center_lock_screen_controller.cc",
-    "message_center/ash_message_center_lock_screen_controller.h",
-    "message_center/message_center_bubble.cc",
-    "message_center/message_center_bubble.h",
-    "message_center/message_center_button_bar.cc",
-    "message_center/message_center_button_bar.h",
-    "message_center/message_center_controller.cc",
-    "message_center/message_center_controller.h",
-    "message_center/message_center_scroll_bar.cc",
-    "message_center/message_center_scroll_bar.h",
-    "message_center/message_center_style.h",
-    "message_center/message_center_ui_controller.cc",
-    "message_center/message_center_ui_controller.h",
-    "message_center/message_center_ui_delegate.h",
-    "message_center/message_center_view.cc",
-    "message_center/message_center_view.h",
-    "message_center/message_list_view.cc",
-    "message_center/message_list_view.h",
-    "message_center/notifier_settings_view.cc",
-    "message_center/notifier_settings_view.h",
     "metrics/demo_session_metrics_recorder.cc",
     "metrics/demo_session_metrics_recorder.h",
     "metrics/desktop_task_switch_metric_recorder.cc",
     "metrics/desktop_task_switch_metric_recorder.h",
-    "metrics/gesture_action_type.h",
     "metrics/login_metrics_recorder.cc",
     "metrics/login_metrics_recorder.h",
     "metrics/pointer_metrics_recorder.cc",
@@ -551,6 +529,8 @@ component("ash") {
     "rotator/screen_rotation_animator_observer.h",
     "rotator/window_rotation.cc",
     "rotator/window_rotation.h",
+    "scoped_animation_disabler.cc",
+    "scoped_animation_disabler.h",
     "scoped_root_window_for_new_windows.cc",
     "scoped_root_window_for_new_windows.h",
     "screen_util.cc",
@@ -672,6 +652,10 @@ component("ash") {
     "system/bluetooth/tray_bluetooth.h",
     "system/bluetooth/tray_bluetooth_helper.cc",
     "system/bluetooth/tray_bluetooth_helper.h",
+    "system/bluetooth/tray_bluetooth_helper_experimental.cc",
+    "system/bluetooth/tray_bluetooth_helper_experimental.h",
+    "system/bluetooth/tray_bluetooth_helper_legacy.cc",
+    "system/bluetooth/tray_bluetooth_helper_legacy.h",
     "system/bluetooth/unified_bluetooth_detailed_view_controller.cc",
     "system/bluetooth/unified_bluetooth_detailed_view_controller.h",
     "system/brightness/brightness_controller_chromeos.cc",
@@ -733,16 +717,48 @@ component("ash") {
     "system/locale/locale_notification_controller.h",
     "system/media_security/multi_profile_media_tray_item.cc",
     "system/media_security/multi_profile_media_tray_item.h",
+    "system/message_center/arc_notification_manager_delegate_impl.cc",
+    "system/message_center/arc_notification_manager_delegate_impl.h",
+    "system/message_center/ash_message_center_lock_screen_controller.cc",
+    "system/message_center/ash_message_center_lock_screen_controller.h",
     "system/message_center/ash_popup_alignment_delegate.cc",
     "system/message_center/ash_popup_alignment_delegate.h",
     "system/message_center/fullscreen_notification_blocker.cc",
     "system/message_center/fullscreen_notification_blocker.h",
     "system/message_center/inactive_user_notification_blocker.cc",
     "system/message_center/inactive_user_notification_blocker.h",
+    "system/message_center/message_center_bubble.cc",
+    "system/message_center/message_center_bubble.h",
+    "system/message_center/message_center_button_bar.cc",
+    "system/message_center/message_center_button_bar.h",
+    "system/message_center/message_center_controller.cc",
+    "system/message_center/message_center_controller.h",
+    "system/message_center/message_center_scroll_bar.cc",
+    "system/message_center/message_center_scroll_bar.h",
+    "system/message_center/message_center_style.h",
+    "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_view.cc",
+    "system/message_center/message_center_view.h",
+    "system/message_center/message_list_view.cc",
+    "system/message_center/message_list_view.h",
+    "system/message_center/new_unified_message_center_view.cc",
+    "system/message_center/new_unified_message_center_view.h",
+    "system/message_center/notification_swipe_control_view.cc",
+    "system/message_center/notification_swipe_control_view.h",
     "system/message_center/notification_tray.cc",
     "system/message_center/notification_tray.h",
+    "system/message_center/notifier_settings_view.cc",
+    "system/message_center/notifier_settings_view.h",
     "system/message_center/session_state_notification_blocker.cc",
     "system/message_center/session_state_notification_blocker.h",
+    "system/message_center/slidable_message_view.cc",
+    "system/message_center/slidable_message_view.h",
+    "system/message_center/unified_message_center_view.cc",
+    "system/message_center/unified_message_center_view.h",
+    "system/message_center/unified_message_list_view.cc",
+    "system/message_center/unified_message_list_view.h",
     "system/model/clock_model.cc",
     "system/model/clock_model.h",
     "system/model/enterprise_domain_model.cc",
@@ -755,6 +771,8 @@ component("ash") {
     "system/model/tracing_model.h",
     "system/model/update_model.cc",
     "system/model/update_model.h",
+    "system/model/virtual_keyboard_model.cc",
+    "system/model/virtual_keyboard_model.h",
     "system/network/auto_connect_notifier.cc",
     "system/network/auto_connect_notifier.h",
     "system/network/network_feature_pod_button.cc",
@@ -954,6 +972,8 @@ component("ash") {
     "system/tray/tray_background_view.cc",
     "system/tray/tray_background_view.h",
     "system/tray/tray_bubble_base.h",
+    "system/tray/tray_bubble_view.cc",
+    "system/tray/tray_bubble_view.h",
     "system/tray/tray_bubble_wrapper.cc",
     "system/tray/tray_bubble_wrapper.h",
     "system/tray/tray_constants.cc",
@@ -1019,8 +1039,6 @@ component("ash") {
     "system/unified/top_shortcuts_view.h",
     "system/unified/unified_detailed_view_delegate.cc",
     "system/unified/unified_detailed_view_delegate.h",
-    "system/unified/unified_message_center_view.cc",
-    "system/unified/unified_message_center_view.h",
     "system/unified/unified_notifier_settings_controller.cc",
     "system/unified/unified_notifier_settings_controller.h",
     "system/unified/unified_slider_bubble_controller.cc",
@@ -1119,8 +1137,6 @@ component("ash") {
     "wm/drag_window_controller.cc",
     "wm/drag_window_controller.h",
     "wm/drag_window_resizer.cc",
-    "wm/drag_window_resizer_mash.cc",
-    "wm/drag_window_resizer_mash.h",
     "wm/event_client_impl.cc",
     "wm/event_client_impl.h",
     "wm/focus_rules.cc",
@@ -1147,9 +1163,8 @@ component("ash") {
     "wm/lock_window_state.cc",
     "wm/lock_window_state.h",
     "wm/mru_window_tracker.cc",
+    "wm/native_cursor_manager_ash.cc",
     "wm/native_cursor_manager_ash.h",
-    "wm/native_cursor_manager_ash_classic.cc",
-    "wm/native_cursor_manager_ash_classic.h",
     "wm/non_client_frame_controller.cc",
     "wm/non_client_frame_controller.h",
     "wm/overlay_event_filter.cc",
@@ -1158,6 +1173,8 @@ component("ash") {
     "wm/overlay_layout_manager.h",
     "wm/overview/cleanup_animation_observer.cc",
     "wm/overview/cleanup_animation_observer.h",
+    "wm/overview/drop_target_view.cc",
+    "wm/overview/drop_target_view.h",
     "wm/overview/overview_animation_type.h",
     "wm/overview/overview_utils.cc",
     "wm/overview/overview_utils.h",
@@ -1171,6 +1188,8 @@ component("ash") {
     "wm/overview/scoped_overview_animation_settings.h",
     "wm/overview/scoped_transform_overview_window.cc",
     "wm/overview/scoped_transform_overview_window.h",
+    "wm/overview/start_animation_observer.cc",
+    "wm/overview/start_animation_observer.h",
     "wm/overview/window_grid.cc",
     "wm/overview/window_grid.h",
     "wm/overview/window_selector.cc",
@@ -1181,8 +1200,6 @@ component("ash") {
     "wm/overview/window_selector_item.h",
     "wm/property_util.cc",
     "wm/property_util.h",
-    "wm/resize_handle_window_targeter.cc",
-    "wm/resize_handle_window_targeter.h",
     "wm/resize_shadow.cc",
     "wm/resize_shadow.h",
     "wm/resize_shadow_controller.cc",
@@ -1222,9 +1239,8 @@ component("ash") {
     "wm/system_modal_container_layout_manager.h",
     "wm/system_wallpaper_controller.cc",
     "wm/system_wallpaper_controller.h",
-    "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard.h",
-    "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc",
-    "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h",
+    "wm/tablet_mode/internal_input_devices_event_blocker.cc",
+    "wm/tablet_mode/internal_input_devices_event_blocker.h",
     "wm/tablet_mode/scoped_skip_user_session_blocked_check.cc",
     "wm/tablet_mode/scoped_skip_user_session_blocked_check.h",
     "wm/tablet_mode/tablet_mode_app_window_drag_controller.cc",
@@ -1251,7 +1267,6 @@ component("ash") {
     "wm/video_detector.h",
     "wm/widget_finder.cc",
     "wm/widget_finder.h",
-    "wm/window_animation_types.h",
     "wm/window_animations.cc",
     "wm/window_animations.h",
     "wm/window_cycle_controller.cc",
@@ -1300,8 +1315,6 @@ component("ash") {
     "wm/workspace/two_step_edge_cycler.h",
     "wm/workspace/workspace_event_handler.cc",
     "wm/workspace/workspace_event_handler.h",
-    "wm/workspace/workspace_event_handler_classic.cc",
-    "wm/workspace/workspace_event_handler_classic.h",
     "wm/workspace/workspace_layout_manager.cc",
     "wm/workspace/workspace_layout_manager.h",
     "wm/workspace/workspace_types.h",
@@ -1310,6 +1323,8 @@ component("ash") {
     "wm/workspace_controller.h",
     "ws/ash_gpu_interface_provider.cc",
     "ws/ash_gpu_interface_provider.h",
+    "ws/ash_window_manager.cc",
+    "ws/ash_window_manager.h",
     "ws/window_service_delegate_impl.cc",
     "ws/window_service_delegate_impl.h",
     "ws/window_service_owner.cc",
@@ -1326,8 +1341,8 @@ component("ash") {
     "//ash/strings",
     "//ash/wayland",
     "//components/discardable_memory/public/interfaces",
-    "//mash/public/mojom",
     "//mojo/public/cpp/system",
+    "//services/device/public/mojom",
     "//services/service_manager/embedder",
     "//services/ws:host",
     "//services/ws:lib",
@@ -1371,6 +1386,7 @@ component("ash") {
     "//chromeos/components/proximity_auth/logging",
     "//chromeos/services/assistant/public/mojom",
     "//chromeos/services/multidevice_setup/public/mojom",
+    "//chromeos/strings",
     "//components/account_id",
     "//components/device_event_log",
     "//components/discardable_memory/service",
@@ -1394,12 +1410,15 @@ component("ash") {
     "//gpu/command_buffer/client:gles2_interface",
     "//media",
     "//net",
+    "//services/content/public/cpp",
     "//services/data_decoder/public/cpp",
     "//services/preferences/public/cpp",
     "//services/service_manager/public/cpp",
     "//services/ws/gpu_host",
+    "//services/ws/public/cpp/host",
     "//services/ws/public/cpp/input_devices:input_device_controller",
     "//services/ws/public/mojom/input_devices",
+    "//services/ws/remote_view_host",
 
     # TODO(msw): Remove this; only ash_with_content should depend on webkit.
     "//ash/app_list/presenter",
@@ -1414,7 +1433,6 @@ component("ash") {
     "//ui/chromeos",
     "//ui/chromeos/events",
     "//ui/chromeos/resources",
-    "//ui/chromeos/strings",
     "//ui/compositor",
     "//ui/compositor_extra",
     "//ui/display",
@@ -1472,8 +1490,6 @@ component("ash") {
 component("ash_with_content") {
   sources = [
     "content/ash_with_content_export.h",
-    "content/content_gpu_interface_provider.cc",
-    "content/content_gpu_interface_provider.h",
     "content/keyboard_overlay/keyboard_overlay_delegate.cc",
     "content/keyboard_overlay/keyboard_overlay_delegate.h",
     "content/keyboard_overlay/keyboard_overlay_view.cc",
@@ -1745,6 +1761,7 @@ test("ash_unittests") {
     "drag_drop/drag_drop_tracker_unittest.cc",
     "drag_drop/drag_image_view_unittest.cc",
     "events/keyboard_driven_event_rewriter_unittest.cc",
+    "events/select_to_speak_event_handler_unittest.cc",
     "events/spoken_feedback_event_rewriter_unittest.cc",
     "extended_desktop_unittest.cc",
     "first_run/first_run_helper_unittest.cc",
@@ -1759,6 +1776,7 @@ test("ash_unittests") {
     "ime/ime_controller_unittest.cc",
     "ime/ime_focus_handler_unittest.cc",
     "keyboard/arc/arc_input_method_surface_manager_unittest.cc",
+    "keyboard/ash_keyboard_controller_unittest.cc",
     "keyboard/virtual_keyboard_controller_unittest.cc",
     "keyboard/virtual_keyboard_unittest.cc",
     "laser/laser_pointer_controller_unittest.cc",
@@ -1781,6 +1799,7 @@ test("ash_unittests") {
     "login/ui/login_keyboard_test_base.h",
     "login/ui/login_password_view_test.cc",
     "login/ui/login_pin_view_unittest.cc",
+    "login/ui/login_public_account_user_view_unittest.cc",
     "login/ui/login_test_base.cc",
     "login/ui/login_test_base.h",
     "login/ui/login_test_utils.cc",
@@ -1793,10 +1812,6 @@ test("ash_unittests") {
     "magnifier/magnifier_test_utils.cc",
     "magnifier/magnifier_test_utils.h",
     "magnifier/partial_magnification_controller_unittest.cc",
-    "message_center/message_center_ui_controller_unittest.cc",
-    "message_center/message_center_view_unittest.cc",
-    "message_center/message_list_view_unittest.cc",
-    "message_center/notifier_settings_view_unittest.cc",
     "metrics/demo_session_metrics_recorder_unittest.cc",
     "metrics/desktop_task_switch_metric_recorder_unittest.cc",
     "metrics/login_metrics_recorder_unittest.cc",
@@ -1837,7 +1852,7 @@ test("ash_unittests") {
     "system/accessibility/select_to_speak_tray_unittest.cc",
     "system/audio/tray_audio_unittest.cc",
     "system/bluetooth/bluetooth_power_controller_unittest.cc",
-    "system/bluetooth/tray_bluetooth_helper_unittest.cc",
+    "system/bluetooth/tray_bluetooth_helper_legacy_unittest.cc",
     "system/brightness/tray_brightness_unittest.cc",
     "system/caps_lock_notification_controller_unittest.cc",
     "system/date/date_view_unittest.cc",
@@ -1854,8 +1869,14 @@ test("ash_unittests") {
     "system/message_center/arc/arc_notification_view_unittest.cc",
     "system/message_center/ash_popup_alignment_delegate_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_view_unittest.cc",
+    "system/message_center/message_list_view_unittest.cc",
+    "system/message_center/new_unified_message_center_view_unittest.cc",
     "system/message_center/notification_tray_unittest.cc",
+    "system/message_center/notifier_settings_view_unittest.cc",
     "system/message_center/session_state_notification_blocker_unittest.cc",
+    "system/message_center/unified_message_list_view_unittest.cc",
     "system/network/auto_connect_notifier_unittest.cc",
     "system/network/network_icon_unittest.cc",
     "system/network/sms_observer_unittest.cc",
@@ -1951,6 +1972,8 @@ test("ash_unittests") {
     "wm/overlay_event_filter_unittest.cc",
     "wm/overlay_layout_manager_unittest.cc",
     "wm/overview/cleanup_animation_observer_unittest.cc",
+    "wm/overview/start_animation_observer_unittest.cc",
+    "wm/overview/window_selector_controller_unittest.cc",
     "wm/overview/window_selector_unittest.cc",
     "wm/resize_shadow_and_cursor_unittest.cc",
     "wm/root_window_layout_manager_unittest.cc",
@@ -1983,6 +2006,7 @@ test("ash_unittests") {
     "wm/workspace/workspace_layout_manager_unittest.cc",
     "wm/workspace/workspace_window_resizer_unittest.cc",
     "wm/workspace_controller_unittest.cc",
+    "ws/ash_window_manager_unittest.cc",
     "ws/window_service_delegate_impl_unittest.cc",
   ]
   configs += [
@@ -2067,6 +2091,7 @@ test("ash_unittests") {
     "//ui/gfx/geometry",
     "//ui/gl:test_support",
     "//ui/keyboard",
+    "//ui/keyboard:mojom",
     "//ui/keyboard:test_support",
     "//ui/message_center",
     "//ui/message_center:test_support",
@@ -2176,6 +2201,7 @@ static_library("test_support_with_content") {
     "//ash:ash_with_content",
     "//content/public/browser",
     "//content/test:test_support",
+    "//services/network:test_support",
     "//skia",
     "//ui/views/controls/webview",
   ]
@@ -2202,6 +2228,7 @@ static_library("test_support_common") {
     "display/mirror_window_test_api.h",
     "display/screen_orientation_controller_test_api.cc",
     "display/screen_orientation_controller_test_api.h",
+    "drag_drop/drag_drop_controller_test_api.h",
     "highlighter/highlighter_controller_test_api.cc",
     "highlighter/highlighter_controller_test_api.h",
     "ime/test_ime_controller_client.cc",
@@ -2234,8 +2261,6 @@ static_library("test_support_common") {
     "session/test_session_controller_client.h",
     "shelf/overflow_bubble_view_test_api.cc",
     "shelf/overflow_bubble_view_test_api.h",
-    "shelf/overflow_button_test_api.cc",
-    "shelf/overflow_button_test_api.h",
     "shelf/shelf_button_pressed_metric_tracker_test_api.cc",
     "shelf/shelf_button_pressed_metric_tracker_test_api.h",
     "shelf/shelf_test_api.cc",
@@ -2333,9 +2358,12 @@ static_library("test_support_common") {
     "//components/user_manager:user_manager",
     "//components/viz/test:test_support",
     "//device/bluetooth",
+    "//services/device/public/mojom",
     "//services/ws:test_support",
     "//services/ws/public/cpp",
+    "//services/ws/public/cpp/host",
     "//services/ws/public/cpp/input_devices",
+    "//services/ws/public/cpp/input_devices:test_support",
     "//services/ws/public/mojom",
     "//skia",
     "//testing/gtest",
@@ -2385,6 +2413,7 @@ static_library("interactive_ui_test_support") {
     "//testing/gtest",
     "//ui/aura",
     "//ui/base",
+    "//ui/base:test_support",
     "//ui/gl:test_support",
   ]
 }
@@ -2403,8 +2432,6 @@ service("ash_service") {
     "//services/service_manager/public/cpp",
   ]
 
-  # TODO(beng): This target relies on //mash/session, but there is a cycle so we
-  #             can't state that dependency here.
   data_deps = [
     ":ash_service_resources",
     ":ash_service_resources_200",
@@ -2424,6 +2451,7 @@ repack("ash_service_resources") {
   sources = [
     "$root_gen_dir/ash/components/resources/ash_components_resources_100_percent.pak",
     "$root_gen_dir/ash/strings/ash_strings_en-US.pak",
+    "$root_gen_dir/chromeos/strings/chromeos_strings_en-US.pak",
     "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_100_percent.pak",
     "$root_gen_dir/ui/chromeos/strings/ui_chromeos_strings_en-US.pak",
     "$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
@@ -2434,6 +2462,7 @@ repack("ash_service_resources") {
   deps = [
     "//ash/components/resources",
     "//ash/strings",
+    "//chromeos/strings",
     "//ui/chromeos/resources",
     "//ui/chromeos/strings",
     "//ui/resources",