BASELINE: Update Chromium to 69.0.3497.70

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

1 files changed, 212 insertions, 66 deletions

diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn
index dc1960e7741..619017d162f 100644
--- a/chromium/ash/BUILD.gn
+++ b/chromium/ash/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//chromeos/assistant/assistant.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
+import("//services/catalog/public/tools/catalog.gni")
 import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//testing/test.gni")
@@ -18,10 +19,15 @@ assert(is_chromeos)
 assert(use_aura)
 assert(enable_hidpi)
 
+# Chromebooks use ozone/DRM. linux-chromeos uses ozone/X11.
+assert(use_ozone)
+
 component("ash") {
   sources = [
     "accelerators/accelerator_commands.cc",
     "accelerators/accelerator_commands.h",
+    "accelerators/accelerator_confirmation_dialog.cc",
+    "accelerators/accelerator_confirmation_dialog.h",
     "accelerators/accelerator_controller.cc",
     "accelerators/accelerator_controller.h",
     "accelerators/accelerator_controller_registrar.cc",
@@ -55,6 +61,8 @@ component("ash") {
     "accessibility/accessibility_focus_ring.h",
     "accessibility/accessibility_focus_ring_controller.cc",
     "accessibility/accessibility_focus_ring_controller.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",
@@ -74,6 +82,8 @@ component("ash") {
     "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/spoken_feedback_enabler.cc",
     "accessibility/spoken_feedback_enabler.h",
     "accessibility/touch_accessibility_enabler.cc",
@@ -85,28 +95,43 @@ component("ash") {
     "animation/animation_change_type.h",
     "app_list/app_list_controller_impl.cc",
     "app_list/app_list_controller_impl.h",
-    "app_list/app_list_presenter_delegate.cc",
-    "app_list/app_list_presenter_delegate.h",
-    "app_list/app_list_presenter_delegate_factory.cc",
-    "app_list/app_list_presenter_delegate_factory.h",
-    "app_list/app_list_presenter_impl.cc",
-    "app_list/app_list_presenter_impl.h",
+    "app_list/app_list_presenter_delegate_impl.cc",
+    "app_list/app_list_presenter_delegate_impl.h",
     "ash_export.h",
     "ash_service.cc",
     "ash_service.h",
-    "ash_view_ids.h",
     "assistant/assistant_controller.cc",
     "assistant/assistant_controller.h",
+    "assistant/assistant_controller_observer.h",
+    "assistant/assistant_interaction_controller.cc",
+    "assistant/assistant_interaction_controller.h",
+    "assistant/assistant_notification_controller.cc",
+    "assistant/assistant_notification_controller.h",
+    "assistant/assistant_screen_context_controller.cc",
+    "assistant/assistant_screen_context_controller.h",
+    "assistant/assistant_ui_controller.cc",
+    "assistant/assistant_ui_controller.h",
     "assistant/model/assistant_interaction_model.cc",
     "assistant/model/assistant_interaction_model.h",
     "assistant/model/assistant_interaction_model_observer.h",
     "assistant/model/assistant_query.cc",
     "assistant/model/assistant_query.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.h",
-    "assistant/ui/assistant_bubble.cc",
-    "assistant/ui/assistant_bubble.h",
-    "assistant/ui/assistant_bubble_view.cc",
-    "assistant/ui/assistant_bubble_view.h",
+    "assistant/model/assistant_ui_model.cc",
+    "assistant/model/assistant_ui_model.h",
+    "assistant/model/assistant_ui_model_observer.h",
+    "assistant/ui/assistant_container_view.cc",
+    "assistant/ui/assistant_container_view.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_ui_constants.h",
+    "assistant/ui/assistant_web_view.cc",
+    "assistant/ui/assistant_web_view.h",
     "assistant/ui/caption_bar.cc",
     "assistant/ui/caption_bar.h",
     "assistant/ui/dialog_plate/action_view.cc",
@@ -115,14 +140,32 @@ component("ash") {
     "assistant/ui/dialog_plate/dialog_plate.h",
     "assistant/ui/logo_view/base_logo_view.cc",
     "assistant/ui/logo_view/base_logo_view.h",
-    "assistant/ui/suggestion_container_view.cc",
-    "assistant/ui/suggestion_container_view.h",
+    "assistant/ui/main_stage/assistant_header_view.cc",
+    "assistant/ui/main_stage/assistant_header_view.h",
+    "assistant/ui/main_stage/assistant_main_stage.cc",
+    "assistant/ui/main_stage/assistant_main_stage.h",
+    "assistant/ui/main_stage/assistant_progress_indicator.cc",
+    "assistant/ui/main_stage/assistant_progress_indicator.h",
+    "assistant/ui/main_stage/assistant_query_view.cc",
+    "assistant/ui/main_stage/assistant_query_view.h",
+    "assistant/ui/main_stage/assistant_text_element_view.cc",
+    "assistant/ui/main_stage/assistant_text_element_view.h",
+    "assistant/ui/main_stage/suggestion_container_view.cc",
+    "assistant/ui/main_stage/suggestion_container_view.h",
+    "assistant/ui/main_stage/ui_element_container_view.cc",
+    "assistant/ui/main_stage/ui_element_container_view.h",
+    "assistant/util/animation_util.cc",
+    "assistant/util/animation_util.h",
+    "assistant/util/deep_link_util.cc",
+    "assistant/util/deep_link_util.h",
     "autoclick/autoclick_controller.cc",
     "autoclick/autoclick_controller.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",
@@ -272,10 +315,6 @@ component("ash") {
     "host/ash_window_tree_host_mirroring_unified.h",
     "host/ash_window_tree_host_mus.cc",
     "host/ash_window_tree_host_mus.h",
-    "host/ash_window_tree_host_mus_mirroring_unified.cc",
-    "host/ash_window_tree_host_mus_mirroring_unified.h",
-    "host/ash_window_tree_host_mus_unified.cc",
-    "host/ash_window_tree_host_mus_unified.h",
     "host/ash_window_tree_host_platform.cc",
     "host/ash_window_tree_host_platform.h",
     "host/ash_window_tree_host_unified.cc",
@@ -285,14 +324,18 @@ component("ash") {
     "host/transformer_helper.h",
     "ime/ime_controller.cc",
     "ime/ime_controller.h",
+    "ime/ime_focus_handler.cc",
+    "ime/ime_focus_handler.h",
     "ime/ime_switch_type.h",
-    "keyboard/keyboard_observer_register.cc",
-    "keyboard/keyboard_observer_register.h",
     "keyboard/keyboard_ui.cc",
     "keyboard/keyboard_ui.h",
     "keyboard/keyboard_ui_mash.cc",
     "keyboard/keyboard_ui_mash.h",
     "keyboard/keyboard_ui_observer.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",
     "laser/laser_pointer_controller.cc",
     "laser/laser_pointer_controller.h",
     "laser/laser_pointer_view.cc",
@@ -326,8 +369,6 @@ component("ash") {
     "login/ui/hover_notifier.h",
     "login/ui/image_parser.cc",
     "login/ui/image_parser.h",
-    "login/ui/layout_util.cc",
-    "login/ui/layout_util.h",
     "login/ui/lock_contents_view.cc",
     "login/ui/lock_contents_view.h",
     "login/ui/lock_debug_view.cc",
@@ -372,6 +413,8 @@ component("ash") {
     "login/ui/scrollable_users_list_view.h",
     "login/ui/user_switch_flip_animation.cc",
     "login/ui/user_switch_flip_animation.h",
+    "login/ui/views_utils.cc",
+    "login/ui/views_utils.h",
     "login_status.h",
     "magnifier/docked_magnifier_controller.cc",
     "magnifier/docked_magnifier_controller.h",
@@ -391,6 +434,8 @@ component("ash") {
     "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_view.cc",
     "message_center/message_center_view.h",
@@ -499,9 +544,13 @@ component("ash") {
     "shelf/shelf_layout_manager_observer.h",
     "shelf/shelf_locking_manager.cc",
     "shelf/shelf_locking_manager.h",
+    "shelf/shelf_menu_model_adapter.cc",
+    "shelf/shelf_menu_model_adapter.h",
     "shelf/shelf_observer.h",
     "shelf/shelf_tooltip_bubble.cc",
     "shelf/shelf_tooltip_bubble.h",
+    "shelf/shelf_tooltip_bubble_base.cc",
+    "shelf/shelf_tooltip_bubble_base.h",
     "shelf/shelf_tooltip_manager.cc",
     "shelf/shelf_tooltip_manager.h",
     "shelf/shelf_tooltip_preview_bubble.cc",
@@ -516,11 +565,13 @@ component("ash") {
     "shelf/shelf_window_watcher.h",
     "shelf/shelf_window_watcher_item_delegate.cc",
     "shelf/shelf_window_watcher_item_delegate.h",
+    "shelf/window_preview.cc",
+    "shelf/window_preview.h",
     "shell.cc",
     "shell.h",
     "shell_delegate.h",
-    "shell_delegate_mus.cc",
-    "shell_delegate_mus.h",
+    "shell_delegate_mash.cc",
+    "shell_delegate_mash.h",
     "shell_init_params.cc",
     "shell_init_params.h",
     "shell_observer.h",
@@ -530,8 +581,8 @@ component("ash") {
     "shell_port_classic.h",
     "shell_port_mash.cc",
     "shell_port_mash.h",
-    "shell_port_mus.cc",
-    "shell_port_mus.h",
+    "shell_state.cc",
+    "shell_state.h",
     "shutdown_controller.cc",
     "shutdown_controller.h",
     "shutdown_reason.cc",
@@ -551,14 +602,20 @@ component("ash") {
     "system/accessibility/select_to_speak_tray.h",
     "system/audio/audio_detailed_view.cc",
     "system/audio/audio_detailed_view.h",
+    "system/audio/display_speaker_controller.cc",
+    "system/audio/display_speaker_controller.h",
     "system/audio/tray_audio.cc",
     "system/audio/tray_audio.h",
+    "system/audio/unified_audio_detailed_view_controller.cc",
+    "system/audio/unified_audio_detailed_view_controller.h",
     "system/audio/unified_volume_slider_controller.cc",
     "system/audio/unified_volume_slider_controller.h",
     "system/audio/unified_volume_view.cc",
     "system/audio/unified_volume_view.h",
     "system/audio/volume_view.cc",
     "system/audio/volume_view.h",
+    "system/bluetooth/bluetooth_detailed_view.cc",
+    "system/bluetooth/bluetooth_detailed_view.h",
     "system/bluetooth/bluetooth_feature_pod_controller.cc",
     "system/bluetooth/bluetooth_feature_pod_controller.h",
     "system/bluetooth/bluetooth_notification_controller.cc",
@@ -570,6 +627,8 @@ component("ash") {
     "system/bluetooth/tray_bluetooth.h",
     "system/bluetooth/tray_bluetooth_helper.cc",
     "system/bluetooth/tray_bluetooth_helper.h",
+    "system/bluetooth/unified_bluetooth_detailed_view_controller.cc",
+    "system/bluetooth/unified_bluetooth_detailed_view_controller.h",
     "system/brightness/brightness_controller_chromeos.cc",
     "system/brightness/brightness_controller_chromeos.h",
     "system/brightness/tray_brightness.cc",
@@ -583,8 +642,12 @@ component("ash") {
     "system/caps_lock_notification_controller.h",
     "system/cast/cast_feature_pod_controller.cc",
     "system/cast/cast_feature_pod_controller.h",
+    "system/cast/cast_notification_controller.cc",
+    "system/cast/cast_notification_controller.h",
     "system/cast/tray_cast.cc",
     "system/cast/tray_cast.h",
+    "system/cast/unified_cast_detailed_view_controller.cc",
+    "system/cast/unified_cast_detailed_view_controller.h",
     "system/date/clock_observer.h",
     "system/date/date_view.cc",
     "system/date/date_view.h",
@@ -608,6 +671,8 @@ component("ash") {
     "system/ime/ime_observer.h",
     "system/ime/tray_ime_chromeos.cc",
     "system/ime/tray_ime_chromeos.h",
+    "system/ime/unified_ime_detailed_view_controller.cc",
+    "system/ime/unified_ime_detailed_view_controller.h",
     "system/ime_menu/ime_list_view.cc",
     "system/ime_menu/ime_list_view.h",
     "system/ime_menu/ime_menu_tray.cc",
@@ -616,6 +681,8 @@ component("ash") {
     "system/keyboard_brightness/keyboard_brightness_controller.h",
     "system/keyboard_brightness/tray_keyboard_brightness.cc",
     "system/keyboard_brightness/tray_keyboard_brightness.h",
+    "system/keyboard_brightness/unified_keyboard_brightness_slider_controller.cc",
+    "system/keyboard_brightness/unified_keyboard_brightness_slider_controller.h",
     "system/keyboard_brightness_control_delegate.h",
     "system/locale/locale_notification_controller.cc",
     "system/locale/locale_notification_controller.h",
@@ -643,6 +710,8 @@ component("ash") {
     "system/model/tracing_model.h",
     "system/model/update_model.cc",
     "system/model/update_model.h",
+    "system/network/auto_connect_notifier.cc",
+    "system/network/auto_connect_notifier.h",
     "system/network/network_feature_pod_button.cc",
     "system/network/network_feature_pod_button.h",
     "system/network/network_feature_pod_controller.cc",
@@ -671,6 +740,10 @@ component("ash") {
     "system/network/tray_network_state_observer.h",
     "system/network/tray_vpn.cc",
     "system/network/tray_vpn.h",
+    "system/network/unified_network_detailed_view_controller.cc",
+    "system/network/unified_network_detailed_view_controller.h",
+    "system/network/unified_vpn_detailed_view_controller.cc",
+    "system/network/unified_vpn_detailed_view_controller.h",
     "system/network/vpn_feature_pod_controller.cc",
     "system/network/vpn_feature_pod_controller.h",
     "system/network/vpn_list.cc",
@@ -829,12 +902,11 @@ component("ash") {
     "system/tray/system_tray.h",
     "system/tray/system_tray_bubble.cc",
     "system/tray/system_tray_bubble.h",
-    "system/tray/system_tray_controller.cc",
-    "system/tray/system_tray_controller.h",
     "system/tray/system_tray_item.cc",
     "system/tray/system_tray_item.h",
     "system/tray/system_tray_item_detailed_view_delegate.cc",
     "system/tray/system_tray_item_detailed_view_delegate.h",
+    "system/tray/system_tray_item_uma_type.h",
     "system/tray/system_tray_notifier.cc",
     "system/tray/system_tray_notifier.h",
     "system/tray/system_tray_view.cc",
@@ -891,6 +963,8 @@ component("ash") {
     "system/unified/feature_pod_controller_base.h",
     "system/unified/feature_pods_container_view.cc",
     "system/unified/feature_pods_container_view.h",
+    "system/unified/ime_mode_view.cc",
+    "system/unified/ime_mode_view.h",
     "system/unified/notification_counter_view.cc",
     "system/unified/notification_counter_view.h",
     "system/unified/quiet_mode_feature_pod_controller.cc",
@@ -901,8 +975,14 @@ component("ash") {
     "system/unified/top_shortcut_button.h",
     "system/unified/top_shortcuts_view.cc",
     "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",
+    "system/unified/unified_slider_bubble_controller.h",
     "system/unified/unified_slider_view.cc",
     "system/unified/unified_slider_view.h",
     "system/unified/unified_system_info_view.cc",
@@ -919,6 +999,8 @@ component("ash") {
     "system/unified/unified_system_tray_view.h",
     "system/unified/user_chooser_view.cc",
     "system/unified/user_chooser_view.h",
+    "system/unified_accessibility_detailed_view_controller.cc",
+    "system/unified_accessibility_detailed_view_controller.h",
     "system/update/tray_update.cc",
     "system/update/tray_update.h",
     "system/update/update_notification_controller.cc",
@@ -959,13 +1041,8 @@ component("ash") {
     "utility/screenshot_controller.h",
     "utility/transformer_util.cc",
     "utility/transformer_util.h",
-    "virtual_keyboard_container_layout_manager.cc",
-    "virtual_keyboard_container_layout_manager.h",
-    "virtual_keyboard_controller.cc",
-    "virtual_keyboard_controller.h",
     "voice_interaction/voice_interaction_controller.cc",
     "voice_interaction/voice_interaction_controller.h",
-    "voice_interaction/voice_interaction_observer.h",
     "wallpaper/wallpaper_controller.cc",
     "wallpaper/wallpaper_controller.h",
     "wallpaper/wallpaper_controller_observer.h",
@@ -1048,12 +1125,12 @@ component("ash") {
     "wm/native_cursor_manager_ash.h",
     "wm/native_cursor_manager_ash_classic.cc",
     "wm/native_cursor_manager_ash_classic.h",
-    "wm/native_cursor_manager_ash_mus.cc",
-    "wm/native_cursor_manager_ash_mus.h",
     "wm/non_client_frame_controller.cc",
     "wm/non_client_frame_controller.h",
     "wm/overlay_event_filter.cc",
     "wm/overlay_event_filter.h",
+    "wm/overlay_layout_manager.cc",
+    "wm/overlay_layout_manager.h",
     "wm/overview/cleanup_animation_observer.cc",
     "wm/overview/cleanup_animation_observer.h",
     "wm/overview/overview_animation_type.h",
@@ -1139,8 +1216,14 @@ component("ash") {
     "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_ozone.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",
+    "wm/tablet_mode/tablet_mode_app_window_drag_controller.h",
     "wm/tablet_mode/tablet_mode_backdrop_delegate_impl.cc",
     "wm/tablet_mode/tablet_mode_backdrop_delegate_impl.h",
+    "wm/tablet_mode/tablet_mode_browser_window_drag_controller.cc",
+    "wm/tablet_mode/tablet_mode_browser_window_drag_controller.h",
+    "wm/tablet_mode/tablet_mode_browser_window_drag_delegate.cc",
+    "wm/tablet_mode/tablet_mode_browser_window_drag_delegate.h",
     "wm/tablet_mode/tablet_mode_controller.cc",
     "wm/tablet_mode/tablet_mode_controller.h",
     "wm/tablet_mode/tablet_mode_event_handler.cc",
@@ -1148,10 +1231,10 @@ component("ash") {
     "wm/tablet_mode/tablet_mode_event_handler_classic.cc",
     "wm/tablet_mode/tablet_mode_event_handler_classic.h",
     "wm/tablet_mode/tablet_mode_observer.h",
+    "wm/tablet_mode/tablet_mode_window_drag_delegate.cc",
+    "wm/tablet_mode/tablet_mode_window_drag_delegate.h",
     "wm/tablet_mode/tablet_mode_window_manager.cc",
     "wm/tablet_mode/tablet_mode_window_manager.h",
-    "wm/tablet_mode/tablet_mode_window_resizer.cc",
-    "wm/tablet_mode/tablet_mode_window_resizer.h",
     "wm/tablet_mode/tablet_mode_window_state.cc",
     "wm/tablet_mode/tablet_mode_window_state.h",
     "wm/top_level_window_factory.cc",
@@ -1231,6 +1314,8 @@ component("ash") {
     "wm/workspace/workspace_window_resizer.h",
     "wm/workspace_controller.cc",
     "wm/workspace_controller.h",
+    "ws/ash_gpu_interface_provider.cc",
+    "ws/ash_gpu_interface_provider.h",
     "ws/window_service_delegate_impl.cc",
     "ws/window_service_delegate_impl.h",
     "ws/window_service_owner.cc",
@@ -1255,6 +1340,7 @@ component("ash") {
     "//services/ui/public/cpp/input_devices",
     "//services/ui/public/interfaces",
     "//services/ui/public/interfaces/display",
+    "//services/ui/ws2:host",
     "//services/ui/ws2:lib",
     "//skia",
     "//ui/aura",
@@ -1269,6 +1355,7 @@ component("ash") {
     "//ui/wm",
   ]
   deps = [
+    "//ash/app_menu",
     "//ash/autoclick/common:autoclick",
     "//ash/components/autoclick/public/mojom",
     "//ash/components/cursor",
@@ -1276,6 +1363,7 @@ component("ash") {
     "//ash/components/quick_launch/public/mojom",
     "//ash/components/shortcut_viewer/public/mojom",
     "//ash/components/tap_visualizer/public/mojom",
+    "//ash/keyboard/arc",
     "//ash/system/message_center/arc",
     "//ash/touch_hud",
     "//base",
@@ -1292,6 +1380,7 @@ component("ash") {
     "//chromeos/services/multidevice_setup/public/mojom",
     "//components/account_id",
     "//components/device_event_log",
+    "//components/discardable_memory/service",
     "//components/exo",
     "//components/exo/wayland",
     "//components/onc",
@@ -1315,6 +1404,11 @@ component("ash") {
     "//services/data_decoder/public/cpp",
     "//services/preferences/public/cpp",
     "//services/service_manager/public/cpp",
+    "//services/ui/gpu_host",
+
+    # TODO(sky): this should not be necessary once --mash goes away.
+    "//services/ui:lib",
+    "//services/ui/public/cpp/input_devices:input_device_controller",
     "//services/ui/public/interfaces/input_devices",
 
     # TODO(msw): Remove this; only ash_with_content should depend on webkit.
@@ -1349,6 +1443,7 @@ component("ash") {
     "//ui/native_theme",
     "//ui/ozone",
     "//ui/platform_window",
+    "//ui/platform_window/mojo",
     "//ui/platform_window/stub",
     "//ui/snapshot",
     "//ui/wm/public",
@@ -1388,16 +1483,14 @@ component("ash") {
 component("ash_with_content") {
   sources = [
     "content/ash_with_content_export.h",
-    "content/content_gpu_support.cc",
-    "content/content_gpu_support.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",
     "content/keyboard_overlay/keyboard_overlay_view.h",
     "content/screen_orientation_delegate_chromeos.cc",
     "content/screen_orientation_delegate_chromeos.h",
-    "content/shell_content_state.cc",
-    "content/shell_content_state.h",
   ]
 
   defines = [ "ASH_WITH_CONTENT_IMPLEMENTATION" ]
@@ -1413,6 +1506,8 @@ component("ash_with_content") {
     "//content/public/browser",
     "//gpu/config",
     "//ipc",
+    "//mojo/public/cpp/bindings",
+    "//services/ui/public/interfaces",
     "//skia",
     "//ui/aura",
     "//ui/base",
@@ -1467,7 +1562,6 @@ static_library("ash_shell_lib") {
     ":ash",
     ":test_support_without_content",
     "//ash/app_list/presenter",
-    "//ash/app_list/presenter:test_support",
     "//ash/public/cpp",
     "//base",
     "//base:i18n",
@@ -1494,15 +1588,12 @@ static_library("ash_shell_lib_with_content") {
     "shell/content/client/shell_content_browser_client.h",
     "shell/content/client/shell_main_delegate.cc",
     "shell/content/client/shell_main_delegate.h",
-    "shell/content/shell_content_state_impl.cc",
-    "shell/content/shell_content_state_impl.h",
   ]
 
   deps = [
     ":ash_shell_lib",
     ":ash_with_content",
     ":test_support_without_content",
-    "//ash/app_list/presenter:test_support",
     "//ash/components/quick_launch:lib",
     "//ash/components/quick_launch/public/mojom",
     "//ash/components/shortcut_viewer:lib",
@@ -1577,8 +1668,9 @@ test("ash_content_unittests") {
     "//content/public/browser",
     "//content/test:test_support",
     "//device/bluetooth",
-    "//mojo/edk",
+    "//mojo/core/embedder",
     "//net",
+    "//services/catalog:lib",
     "//skia",
     "//testing/gtest",
     "//ui/aura",
@@ -1599,6 +1691,7 @@ test("ash_content_unittests") {
   ]
 
   data_deps = [
+    ":ash_unittests_catalog_copy",
     "//ash/resources:ash_test_resources_with_content_100_percent",
   ]
 }
@@ -1609,21 +1702,30 @@ test("ash_unittests") {
     "accelerators/accelerator_controller_unittest.cc",
     "accelerators/accelerator_filter_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/touch_accessibility_enabler_unittest.cc",
     "accessibility/touch_exploration_controller_unittest.cc",
     "accessibility/touch_exploration_manager_unittest.cc",
+    "app_launch_unittest.cc",
     "app_list/app_list_presenter_delegate_unittest.cc",
     "app_list/model/app_list_item_list_unittest.cc",
     "app_list/model/app_list_model_unittest.cc",
+    "app_list/presenter/app_list_presenter_impl_unittest.cc",
+    "app_menu/notification_menu_controller_unittest.cc",
+    "app_menu/notification_menu_view_unittest.cc",
     "assistant/assistant_controller_unittest.cc",
+    "assistant/assistant_screen_context_controller_unittest.cc",
+    "assistant/util/deep_link_util_unittest.cc",
     "autoclick/autoclick_unittest.cc",
+    "cursor_unittest.cc",
     "detachable_base/detachable_base_handler_unittest.cc",
     "detachable_base/detachable_base_notification_controller_unittest.cc",
     "dip_unittest.cc",
@@ -1664,6 +1766,9 @@ test("ash_unittests") {
     "highlighter/highlighter_controller_unittest.cc",
     "highlighter/highlighter_gesture_util_unittest.cc",
     "ime/ime_controller_unittest.cc",
+    "ime/ime_focus_handler_unittest.cc",
+    "keyboard/virtual_keyboard_controller_unittest.cc",
+    "keyboard/virtual_keyboard_unittest.cc",
     "laser/laser_pointer_controller_unittest.cc",
     "laser/laser_segment_utils_unittest.cc",
     "lock_screen_action/lock_screen_action_background_controller_impl_unittest.cc",
@@ -1729,6 +1834,7 @@ test("ash_unittests") {
     "shelf/shelf_view_unittest.cc",
     "shelf/shelf_widget_unittest.cc",
     "shelf/shelf_window_watcher_unittest.cc",
+    "shell_state_unittest.cc",
     "shell_unittest.cc",
     "sticky_keys/sticky_keys_overlay_unittest.cc",
     "sticky_keys/sticky_keys_unittest.cc",
@@ -1754,6 +1860,7 @@ test("ash_unittests") {
     "system/message_center/inactive_user_notification_blocker_unittest.cc",
     "system/message_center/notification_tray_unittest.cc",
     "system/message_center/session_state_notification_blocker_unittest.cc",
+    "system/network/auto_connect_notifier_unittest.cc",
     "system/network/network_icon_unittest.cc",
     "system/network/sms_observer_unittest.cc",
     "system/network/tray_network_unittest.cc",
@@ -1807,9 +1914,11 @@ test("ash_unittests") {
     "system/tray_tracing_unittest.cc",
     "system/unified/accessibility_feature_pod_controller_unittest.cc",
     "system/unified/feature_pods_container_view_unittest.cc",
+    "system/unified/quiet_mode_feature_pod_controller_unittest.cc",
     "system/unified/top_shortcuts_view_unittest.cc",
     "system/unified/unified_system_info_view_unittest.cc",
     "system/unified/unified_system_tray_controller_unittest.cc",
+    "system/unified/unified_system_tray_unittest.cc",
     "system/update/tray_update_unittest.cc",
     "system/update/update_notification_controller_unittest.cc",
     "system/user/tray_user_unittest.cc",
@@ -1822,7 +1931,6 @@ test("ash_unittests") {
     "tray_action/test_tray_action_client.h",
     "tray_action/tray_action_unittest.cc",
     "utility/screenshot_controller_unittest.cc",
-    "virtual_keyboard_controller_unittest.cc",
     "voice_interaction/voice_interaction_controller_unittest.cc",
     "wallpaper/wallpaper_controller_unittest.cc",
     "wallpaper/wallpaper_utils/wallpaper_color_calculator_unittest.cc",
@@ -1834,6 +1942,7 @@ test("ash_unittests") {
     "wm/ash_focus_rules_unittest.cc",
     "wm/client_controlled_state_unittest.cc",
     "wm/container_finder_unittest.cc",
+    "wm/default_window_resizer_unittest.cc",
     "wm/drag_window_resizer_unittest.cc",
     "wm/fullscreen_window_finder_unittest.cc",
     "wm/gestures/overview_gesture_handler_unittest.cc",
@@ -1843,7 +1952,9 @@ test("ash_unittests") {
     "wm/lock_state_controller_unittest.cc",
     "wm/mru_window_tracker_unittest.cc",
     "wm/native_cursor_manager_ash_unittest.cc",
+    "wm/non_client_frame_controller_unittest.cc",
     "wm/overlay_event_filter_unittest.cc",
+    "wm/overlay_layout_manager_unittest.cc",
     "wm/overview/cleanup_animation_observer_unittest.cc",
     "wm/overview/window_selector_unittest.cc",
     "wm/panels/panel_layout_manager_unittest.cc",
@@ -1861,6 +1972,7 @@ test("ash_unittests") {
     "wm/tablet_mode/accelerometer_test_data_literals.cc",
     "wm/tablet_mode/tablet_mode_controller_unittest.cc",
     "wm/tablet_mode/tablet_mode_window_manager_unittest.cc",
+    "wm/top_level_window_factory_unittest.cc",
     "wm/toplevel_window_event_handler_unittest.cc",
     "wm/video_detector_unittest.cc",
     "wm/window_animations_unittest.cc",
@@ -1877,6 +1989,7 @@ test("ash_unittests") {
     "wm/workspace/workspace_layout_manager_unittest.cc",
     "wm/workspace/workspace_window_resizer_unittest.cc",
     "wm/workspace_controller_unittest.cc",
+    "ws/window_service_delegate_impl_unittest.cc",
   ]
   configs += [
     "//build/config:precompiled_headers",
@@ -1885,12 +1998,15 @@ test("ash_unittests") {
 
   deps = [
     ":ash",
+    ":ash_service_resources",
     ":test_support_without_content",
+    "//ash/app_list:test_support",
     "//ash/app_list/presenter",
-    "//ash/app_list/presenter:test_support",
+    "//ash/app_menu",
     "//ash/autoclick/common:autoclick",
     "//ash/components/fast_ink",
     "//ash/components/fast_ink:unit_tests",
+    "//ash/components/quick_launch/public/mojom:constants",
     "//ash/components/shortcut_viewer:unit_tests",
     "//ash/components/tap_visualizer:unit_tests",
     "//ash/public/cpp",
@@ -1907,6 +2023,8 @@ test("ash_unittests") {
     "//chromeos:power_manager_proto",
     "//chromeos:test_support",
     "//chromeos:test_support_without_gmock",
+    "//chromeos/services/assistant:test_support",
+    "//chromeos/services/multidevice_setup/public/cpp:test_support",
     "//chromeos/services/multidevice_setup/public/mojom",
     "//components/account_id",
     "//components/arc:notification_test_support",
@@ -1918,17 +2036,20 @@ test("ash_unittests") {
     "//components/sync_preferences:test_support",
     "//components/user_manager",
     "//components/user_manager:test_support",
+    "//device/base",
     "//device/bluetooth",
-    "//mojo/edk",
+    "//mojo/core/embedder",
     "//net:net",
+    "//services/catalog:lib",
+    "//services/service_manager/public/cpp:service_test_support",
     "//services/ui/public/cpp/input_devices:test_support",
     "//services/ui/public/interfaces",
+    "//services/ui/ws2:test_support",
     "//skia",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/icu",
     "//ui/accessibility",
-    "//ui/app_list:test_support",
     "//ui/aura",
     "//ui/aura:test_support",
     "//ui/base",
@@ -1959,19 +2080,19 @@ test("ash_unittests") {
     "//ui/strings",
     "//ui/views",
     "//ui/views:test_support",
+    "//ui/views/mus",
     "//ui/wm",
     "//ui/wm:test_support",
     "//ui/wm/public",
     "//url",
   ]
 
-  if (enable_cros_assistant) {
-    deps += [ "//chromeos/services/assistant:test_support" ]
-  }
-
   data_deps = [
+    ":ash_unittests_catalog_copy",
+    ":ash_service_resources",
+    ":ash_service",
     "//ash/resources:ash_test_resources_100_percent",
-    "//testing/buildbot/filters:ash_unittests_filters",
+    "//ash/components/quick_launch:quick_launch_app",
   ]
 
   data = [
@@ -1997,7 +2118,7 @@ test("ash_perftests") {
     "//ash/public/cpp",
     "//base/test:test_support",
     "//cc/base",
-    "//mojo/edk",
+    "//mojo/core/embedder",
     "//testing/gtest",
     "//testing/perf",
     "//ui/aura",
@@ -2016,7 +2137,6 @@ executable("ash_shell_with_content") {
   deps = [
     ":ash_shell_lib_with_content",
     "//base",
-    "//build/config:exe_and_shlib_deps",
     "//build/win:default_exe_manifest",
     "//components/user_manager",
     "//content",
@@ -2051,8 +2171,6 @@ static_library("test_support_with_content") {
   sources = [
     "test/ash_test_environment_content.cc",
     "test/ash_test_environment_content.h",
-    "test/content/test_shell_content_state.cc",
-    "test/content/test_shell_content_state.h",
   ]
   configs += [ "//build/config:precompiled_headers" ]
 
@@ -2111,6 +2229,8 @@ static_library("test_support_common") {
     "mojo_test_interface_factory.h",
 
     # TODO(jamescook): Consider adding a //ash/public/cpp:test_support target.
+    "app_menu/notification_menu_view_test_api.cc",
+    "app_menu/notification_menu_view_test_api.h",
     "public/cpp/immersive/immersive_fullscreen_controller_test_api.cc",
     "public/cpp/immersive/immersive_fullscreen_controller_test_api.h",
     "rotator/screen_rotation_animator_test_api.cc",
@@ -2131,8 +2251,6 @@ static_library("test_support_common") {
     "shell/toplevel_window.h",
     "shell_test_api.cc",
     "shell_test_api.h",
-    "system/cast/tray_cast_test_api.cc",
-    "system/cast/tray_cast_test_api.h",
     "system/palette/palette_tray_test_api.cc",
     "system/palette/palette_tray_test_api.h",
     "system/power/power_button_controller_test_api.cc",
@@ -2151,6 +2269,8 @@ static_library("test_support_common") {
     "system/tray/system_tray_test_api.h",
     "system/tray/test_system_tray_item.cc",
     "system/tray/test_system_tray_item.h",
+    "system/unified/unified_system_tray_test_api.cc",
+    "system/unified/unified_system_tray_test_api.h",
     "test/ash_test_base.cc",
     "test/ash_test_base.h",
     "test/ash_test_environment.h",
@@ -2199,8 +2319,9 @@ static_library("test_support_common") {
   ]
   deps = [
     "//ash",
+    "//ash/app_list:test_support",
     "//ash/app_list/presenter",
-    "//ash/app_list/presenter:test_support",
+    "//ash/app_menu",
     "//ash/components/fast_ink",
     "//ash/public/cpp",
     "//ash/public/interfaces:test_interfaces",
@@ -2218,10 +2339,10 @@ static_library("test_support_common") {
     "//services/ui/public/cpp",
     "//services/ui/public/cpp/input_devices",
     "//services/ui/public/interfaces",
+    "//services/ui/ws2:test_support",
     "//skia",
     "//testing/gtest",
     "//ui/accessibility",
-    "//ui/app_list:test_support",
     "//ui/aura",
     "//ui/aura:test_support",
     "//ui/base:test_support",
@@ -2290,13 +2411,13 @@ service("ash_service") {
   data_deps = [
     ":ash_service_resources",
     ":ash_service_resources_200",
-    "//services/ui",
   ]
 }
 
 service_manifest("manifest") {
   name = "ash"
   source = "manifest.json"
+  packaged_services = [ "//services/ui:manifest" ]
 }
 
 # TODO: Load locale-specific strings.
@@ -2345,11 +2466,9 @@ source_set("mash_unittests") {
   testonly = true
 
   sources = [
-    "app_launch_unittest.cc",
     "display/display_synchronizer_unittest.cc",
     "window_manager_unittest.cc",
-    "wm/non_client_frame_controller_unittest.cc",
-    "wm/top_level_window_factory_unittest.cc",
+    "wm/top_level_window_factory_mash_unittest.cc",
   ]
 
   deps = [
@@ -2391,3 +2510,30 @@ source_set("mash_unittests") {
     "//services/ui/ime/test_ime_driver",
   ]
 }
+
+service_manifest("ash_unittests_manifest") {
+  name = "ash_unittests"
+  source = "ash_unittests_manifest.json"
+}
+
+catalog("ash_unittests_catalog") {
+  testonly = true
+
+  embedded_services = [ ":ash_unittests_manifest" ]
+
+  standalone_services = [
+    ":manifest",
+    "//ash/components/quick_launch:manifest",
+  ]
+}
+
+copy("ash_unittests_catalog_copy") {
+  testonly = true
+  sources = get_target_outputs(":ash_unittests_catalog")
+  outputs = [
+    "${root_out_dir}/ash_unittests_catalog.json",
+  ]
+  deps = [
+    ":ash_unittests_catalog",
+  ]
+}