BASELINE: Update Chromium to 68.0.3440.125

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

1 files changed, 220 insertions, 43 deletions

diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn
index 8ef7018a893..dc1960e7741 100644
--- a/chromium/ash/BUILD.gn
+++ b/chromium/ash/BUILD.gn
@@ -4,6 +4,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/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
@@ -71,6 +72,10 @@ component("ash") {
     "accessibility/focus_ring_controller.h",
     "accessibility/focus_ring_layer.cc",
     "accessibility/focus_ring_layer.h",
+    "accessibility/key_accessibility_enabler.cc",
+    "accessibility/key_accessibility_enabler.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",
@@ -86,24 +91,44 @@ component("ash") {
     "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_view_delegate_mash.cc",
-    "app_list/app_list_view_delegate_mash.h",
-    "ash_constants.cc",
-    "ash_constants.h",
     "ash_export.h",
-    "ash_layout_constants.cc",
-    "ash_layout_constants.h",
+    "ash_service.cc",
+    "ash_service.h",
     "ash_view_ids.h",
-    "assistant/ash_assistant_controller.cc",
-    "assistant/ash_assistant_controller.h",
-    "assistant/model/assistant_interaction_model_impl.cc",
-    "assistant/model/assistant_interaction_model_impl.h",
+    "assistant/assistant_controller.cc",
+    "assistant/assistant_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_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/ui/caption_bar.cc",
+    "assistant/ui/caption_bar.h",
+    "assistant/ui/dialog_plate/action_view.cc",
+    "assistant/ui/dialog_plate/action_view.h",
+    "assistant/ui/dialog_plate/dialog_plate.cc",
+    "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",
     "autoclick/autoclick_controller.cc",
     "autoclick/autoclick_controller.h",
     "cancel_mode.cc",
     "cancel_mode.h",
     "cast_config_controller.cc",
     "cast_config_controller.h",
+    "dbus/ash_dbus_services.cc",
+    "dbus/ash_dbus_services.h",
+    "dbus/display_service_provider.cc",
+    "dbus/display_service_provider.h",
+    "dbus/url_handler_service_provider.cc",
+    "dbus/url_handler_service_provider.h",
     "debug.cc",
     "debug.h",
     "detachable_base/detachable_base_handler.cc",
@@ -116,6 +141,8 @@ component("ash") {
     "disconnected_app_handler.h",
     "display/ash_display_controller.cc",
     "display/ash_display_controller.h",
+    "display/cros_display_config.cc",
+    "display/cros_display_config.h",
     "display/cursor_window_controller.cc",
     "display/cursor_window_controller.h",
     "display/display_animator.cc",
@@ -124,10 +151,14 @@ component("ash") {
     "display/display_color_manager.h",
     "display/display_configuration_controller.cc",
     "display/display_configuration_controller.h",
+    "display/display_configuration_observer.cc",
+    "display/display_configuration_observer.h",
     "display/display_error_observer.cc",
     "display/display_error_observer.h",
     "display/display_move_window_util.cc",
     "display/display_move_window_util.h",
+    "display/display_prefs.cc",
+    "display/display_prefs.h",
     "display/display_shutdown_observer.cc",
     "display/display_shutdown_observer.h",
     "display/display_synchronizer.cc",
@@ -181,6 +212,12 @@ component("ash") {
     "drag_drop/drag_image_view.h",
     "event_matcher_util.cc",
     "event_matcher_util.h",
+    "events/event_rewriter_controller.cc",
+    "events/event_rewriter_controller.h",
+    "events/keyboard_driven_event_rewriter.cc",
+    "events/keyboard_driven_event_rewriter.h",
+    "events/spoken_feedback_event_rewriter.cc",
+    "events/spoken_feedback_event_rewriter.h",
     "first_run/desktop_cleaner.cc",
     "first_run/desktop_cleaner.h",
     "first_run/first_run_helper.cc",
@@ -197,6 +234,8 @@ component("ash") {
     "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/custom_frame_header.h",
     "frame/custom_frame_view_ash.cc",
     "frame/custom_frame_view_ash.h",
     "frame/default_frame_header.cc",
@@ -205,6 +244,7 @@ component("ash") {
     "frame/detached_title_area_renderer.h",
     "frame/frame_border_hit_test.cc",
     "frame/frame_border_hit_test.h",
+    "frame/frame_header.cc",
     "frame/frame_header.h",
     "frame/frame_header_origin_text.cc",
     "frame/frame_header_origin_text.h",
@@ -312,6 +352,8 @@ component("ash") {
     "login/ui/login_detachable_base_model.h",
     "login/ui/login_expanded_public_account_view.cc",
     "login/ui/login_expanded_public_account_view.h",
+    "login/ui/login_menu_view.cc",
+    "login/ui/login_menu_view.h",
     "login/ui/login_password_view.cc",
     "login/ui/login_password_view.h",
     "login/ui/login_pin_view.cc",
@@ -341,6 +383,8 @@ 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/message_center_bubble.cc",
     "message_center/message_center_bubble.h",
     "message_center/message_center_button_bar.cc",
@@ -385,6 +429,8 @@ component("ash") {
     "note_taking_controller.h",
     "pointer_watcher_adapter_classic.cc",
     "pointer_watcher_adapter_classic.h",
+    "policy/policy_recommendation_restorer.cc",
+    "policy/policy_recommendation_restorer.h",
     "root_window_controller.cc",
     "root_window_controller.h",
     "root_window_settings.cc",
@@ -454,8 +500,12 @@ component("ash") {
     "shelf/shelf_locking_manager.cc",
     "shelf/shelf_locking_manager.h",
     "shelf/shelf_observer.h",
+    "shelf/shelf_tooltip_bubble.cc",
+    "shelf/shelf_tooltip_bubble.h",
     "shelf/shelf_tooltip_manager.cc",
     "shelf/shelf_tooltip_manager.h",
+    "shelf/shelf_tooltip_preview_bubble.cc",
+    "shelf/shelf_tooltip_preview_bubble.h",
     "shelf/shelf_view.cc",
     "shelf/shelf_view.h",
     "shelf/shelf_widget.cc",
@@ -495,6 +545,10 @@ component("ash") {
     "sticky_keys/sticky_keys_overlay.cc",
     "sticky_keys/sticky_keys_overlay.h",
     "sticky_keys/sticky_keys_state.h",
+    "system/accessibility/dictation_button_tray.cc",
+    "system/accessibility/dictation_button_tray.h",
+    "system/accessibility/select_to_speak_tray.cc",
+    "system/accessibility/select_to_speak_tray.h",
     "system/audio/audio_detailed_view.cc",
     "system/audio/audio_detailed_view.h",
     "system/audio/tray_audio.cc",
@@ -527,6 +581,8 @@ component("ash") {
     "system/brightness_control_delegate.h",
     "system/caps_lock_notification_controller.cc",
     "system/caps_lock_notification_controller.h",
+    "system/cast/cast_feature_pod_controller.cc",
+    "system/cast/cast_feature_pod_controller.h",
     "system/cast/tray_cast.cc",
     "system/cast/tray_cast.h",
     "system/date/clock_observer.h",
@@ -565,10 +621,22 @@ 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/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/notification_tray.cc",
+    "system/message_center/notification_tray.h",
+    "system/message_center/session_state_notification_blocker.cc",
+    "system/message_center/session_state_notification_blocker.h",
     "system/model/clock_model.cc",
     "system/model/clock_model.h",
     "system/model/enterprise_domain_model.cc",
     "system/model/enterprise_domain_model.h",
+    "system/model/session_length_limit_model.cc",
+    "system/model/session_length_limit_model.h",
     "system/model/system_tray_model.cc",
     "system/model/system_tray_model.h",
     "system/model/tracing_model.cc",
@@ -589,11 +657,12 @@ component("ash") {
     "system/network/network_list.cc",
     "system/network/network_list.h",
     "system/network/network_observer.h",
-    "system/network/network_portal_detector_observer.h",
     "system/network/network_row_title_view.cc",
     "system/network/network_row_title_view.h",
     "system/network/network_state_list_detailed_view.cc",
     "system/network/network_state_list_detailed_view.h",
+    "system/network/network_tray_view.cc",
+    "system/network/network_tray_view.h",
     "system/network/sms_observer.cc",
     "system/network/sms_observer.h",
     "system/network/tray_network.cc",
@@ -608,6 +677,8 @@ component("ash") {
     "system/network/vpn_list.h",
     "system/network/vpn_list_view.cc",
     "system/network/vpn_list_view.h",
+    "system/network/wifi_toggle_notification_controller.cc",
+    "system/network/wifi_toggle_notification_controller.h",
     "system/networking_config_delegate.cc",
     "system/networking_config_delegate.h",
     "system/night_light/night_light_controller.cc",
@@ -662,6 +733,8 @@ component("ash") {
     "system/power/power_button_display_controller.h",
     "system/power/power_button_menu_item_view.cc",
     "system/power/power_button_menu_item_view.h",
+    "system/power/power_button_menu_metrics_type.cc",
+    "system/power/power_button_menu_metrics_type.h",
     "system/power/power_button_menu_screen_view.cc",
     "system/power/power_button_menu_screen_view.h",
     "system/power/power_button_menu_view.cc",
@@ -670,6 +743,8 @@ component("ash") {
     "system/power/power_button_screenshot_controller.h",
     "system/power/power_event_observer.cc",
     "system/power/power_event_observer.h",
+    "system/power/power_notification_controller.cc",
+    "system/power/power_notification_controller.h",
     "system/power/power_prefs.cc",
     "system/power/power_prefs.h",
     "system/power/power_status.cc",
@@ -696,6 +771,8 @@ component("ash") {
     "system/screen_security/screen_share_observer.h",
     "system/screen_security/screen_share_tray_item.cc",
     "system/screen_security/screen_share_tray_item.h",
+    "system/screen_security/screen_switch_check_controller.cc",
+    "system/screen_security/screen_switch_check_controller.h",
     "system/screen_security/screen_tray_item.cc",
     "system/screen_security/screen_tray_item.h",
     "system/session/logout_button_tray.cc",
@@ -704,6 +781,8 @@ component("ash") {
     "system/session/logout_confirmation_controller.h",
     "system/session/logout_confirmation_dialog.cc",
     "system/session/logout_confirmation_dialog.h",
+    "system/session/session_limit_notification_controller.cc",
+    "system/session/session_limit_notification_controller.h",
     "system/session/tray_session_length_limit.cc",
     "system/session/tray_session_length_limit.h",
     "system/status_area_layout_manager.cc",
@@ -712,8 +791,14 @@ component("ash") {
     "system/status_area_widget.h",
     "system/status_area_widget_delegate.cc",
     "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/supervised/tray_supervised_user.cc",
     "system/supervised/tray_supervised_user.h",
+    "system/system_notification_controller.cc",
+    "system/system_notification_controller.h",
     "system/system_tray_focus_observer.h",
     "system/tiles/tiles_default_view.cc",
     "system/tiles/tiles_default_view.h",
@@ -725,10 +810,15 @@ component("ash") {
     "system/toast/toast_manager.h",
     "system/toast/toast_overlay.cc",
     "system/toast/toast_overlay.h",
+    "system/tracing_notification_controller.cc",
+    "system/tracing_notification_controller.h",
     "system/tray/actionable_view.cc",
     "system/tray/actionable_view.h",
+    "system/tray/detailed_view_delegate.h",
     "system/tray/hover_highlight_view.cc",
     "system/tray/hover_highlight_view.h",
+    "system/tray/interacted_by_tap_recorder.cc",
+    "system/tray/interacted_by_tap_recorder.h",
     "system/tray/label_tray_view.cc",
     "system/tray/label_tray_view.h",
     "system/tray/size_range_layout.cc",
@@ -743,20 +833,25 @@ component("ash") {
     "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_notifier.cc",
     "system/tray/system_tray_notifier.h",
     "system/tray/system_tray_view.cc",
     "system/tray/system_tray_view.h",
+    "system/tray/time_to_click_recorder.cc",
+    "system/tray/time_to_click_recorder.h",
     "system/tray/tray_background_view.cc",
     "system/tray/tray_background_view.h",
+    "system/tray/tray_bubble_base.h",
     "system/tray/tray_bubble_wrapper.cc",
     "system/tray/tray_bubble_wrapper.h",
     "system/tray/tray_constants.cc",
     "system/tray/tray_constants.h",
     "system/tray/tray_container.cc",
     "system/tray/tray_container.h",
-    "system/tray/tray_details_view.cc",
-    "system/tray/tray_details_view.h",
+    "system/tray/tray_detailed_view.cc",
+    "system/tray/tray_detailed_view.h",
     "system/tray/tray_event_filter.cc",
     "system/tray/tray_event_filter.h",
     "system/tray/tray_image_item.cc",
@@ -789,12 +884,15 @@ component("ash") {
     "system/unified/accessibility_feature_pod_controller.h",
     "system/unified/collapse_button.cc",
     "system/unified/collapse_button.h",
+    "system/unified/detailed_view_controller.h",
     "system/unified/feature_pod_button.cc",
     "system/unified/feature_pod_button.h",
     "system/unified/feature_pod_controller_base.cc",
     "system/unified/feature_pod_controller_base.h",
     "system/unified/feature_pods_container_view.cc",
     "system/unified/feature_pods_container_view.h",
+    "system/unified/notification_counter_view.cc",
+    "system/unified/notification_counter_view.h",
     "system/unified/quiet_mode_feature_pod_controller.cc",
     "system/unified/quiet_mode_feature_pod_controller.h",
     "system/unified/sign_out_button.cc",
@@ -819,8 +917,12 @@ component("ash") {
     "system/unified/unified_system_tray_model.h",
     "system/unified/unified_system_tray_view.cc",
     "system/unified/unified_system_tray_view.h",
+    "system/unified/user_chooser_view.cc",
+    "system/unified/user_chooser_view.h",
     "system/update/tray_update.cc",
     "system/update/tray_update.h",
+    "system/update/update_notification_controller.cc",
+    "system/update/update_notification_controller.h",
     "system/user/button_from_view.cc",
     "system/user/button_from_view.h",
     "system/user/login_status.cc",
@@ -836,16 +938,6 @@ component("ash") {
     "system/virtual_keyboard/virtual_keyboard_observer.h",
     "system/virtual_keyboard/virtual_keyboard_tray.cc",
     "system/virtual_keyboard/virtual_keyboard_tray.h",
-    "system/web_notification/ash_popup_alignment_delegate.cc",
-    "system/web_notification/ash_popup_alignment_delegate.h",
-    "system/web_notification/fullscreen_notification_blocker.cc",
-    "system/web_notification/fullscreen_notification_blocker.h",
-    "system/web_notification/inactive_user_notification_blocker.cc",
-    "system/web_notification/inactive_user_notification_blocker.h",
-    "system/web_notification/session_state_notification_blocker.cc",
-    "system/web_notification/session_state_notification_blocker.h",
-    "system/web_notification/web_notification_tray.cc",
-    "system/web_notification/web_notification_tray.h",
     "touch/ash_touch_transform_controller.cc",
     "touch/ash_touch_transform_controller.h",
     "touch/touch_devices_controller.cc",
@@ -1025,6 +1117,8 @@ component("ash") {
     "wm/splitview/split_view_divider.h",
     "wm/splitview/split_view_drag_indicators.cc",
     "wm/splitview/split_view_drag_indicators.h",
+    "wm/splitview/split_view_highlight_view.cc",
+    "wm/splitview/split_view_highlight_view.h",
     "wm/splitview/split_view_utils.cc",
     "wm/splitview/split_view_utils.h",
     "wm/stacking_controller.cc",
@@ -1056,6 +1150,8 @@ component("ash") {
     "wm/tablet_mode/tablet_mode_observer.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",
@@ -1103,6 +1199,8 @@ component("ash") {
     "wm/window_util.h",
     "wm/wm_event.cc",
     "wm/wm_event.h",
+    "wm/wm_shadow_controller_delegate.cc",
+    "wm/wm_shadow_controller_delegate.h",
     "wm/wm_snap_to_pixel_layout_manager.cc",
     "wm/wm_snap_to_pixel_layout_manager.h",
     "wm/wm_toplevel_window_event_handler.cc",
@@ -1133,6 +1231,10 @@ component("ash") {
     "wm/workspace/workspace_window_resizer.h",
     "wm/workspace_controller.cc",
     "wm/workspace_controller.h",
+    "ws/window_service_delegate_impl.cc",
+    "ws/window_service_delegate_impl.h",
+    "ws/window_service_owner.cc",
+    "ws/window_service_owner.h",
   ]
 
   configs += [ "//build/config:precompiled_headers" ]
@@ -1141,18 +1243,19 @@ component("ash") {
   public_deps = [
     "//ash/public/cpp",
     "//ash/public/cpp/vector_icons",
-    "//ash/resources",
     "//ash/resources/vector_icons",
     "//ash/strings",
     "//ash/wayland",
+    "//components/discardable_memory/public/interfaces",
     "//mash/public/mojom",
-    "//mojo/common:values_struct_traits",
     "//mojo/public/cpp/system",
+    "//services/service_manager/embedder",
     "//services/ui/common:mus_common",
     "//services/ui/public/cpp",
     "//services/ui/public/cpp/input_devices",
     "//services/ui/public/interfaces",
     "//services/ui/public/interfaces/display",
+    "//services/ui/ws2:lib",
     "//skia",
     "//ui/aura",
     "//ui/events",
@@ -1171,6 +1274,9 @@ component("ash") {
     "//ash/components/cursor",
     "//ash/components/fast_ink",
     "//ash/components/quick_launch/public/mojom",
+    "//ash/components/shortcut_viewer/public/mojom",
+    "//ash/components/tap_visualizer/public/mojom",
+    "//ash/system/message_center/arc",
     "//ash/touch_hud",
     "//base",
     "//base:i18n",
@@ -1180,9 +1286,11 @@ component("ash") {
     "//cc/paint:paint",
     "//chromeos",
     "//chromeos:power_manager_proto",
+    "//chromeos/assistant:buildflags",
     "//chromeos/components/proximity_auth/logging",
     "//chromeos/services/assistant/public/mojom",
     "//chromeos/services/multidevice_setup/public/mojom",
+    "//components/account_id",
     "//components/device_event_log",
     "//components/exo",
     "//components/exo/wayland",
@@ -1192,7 +1300,6 @@ component("ash") {
     "//components/prefs",
     "//components/quirks",
     "//components/session_manager:base",
-    "//components/signin/core/account_id",
     "//components/strings",
     "//components/sync",
     "//components/user_manager",
@@ -1243,13 +1350,14 @@ component("ash") {
     "//ui/ozone",
     "//ui/platform_window",
     "//ui/platform_window/stub",
+    "//ui/snapshot",
     "//ui/wm/public",
     "//url",
   ]
 
   data_deps = [
     "//ash/components/autoclick:autoclick_app",
-    "//ash/components/touch_hud:touch_hud_app",
+    ":dbus_service_files",
   ]
 
   # Usage of content should be in ash_content_unittests.
@@ -1262,11 +1370,26 @@ component("ash") {
     "//components/exo",
     "//components/exo/wayland",
   ]
+
+  if (enable_cros_libassistant) {
+    sources += [
+      "assistant/ui/logo_view/logo_view.cc",
+      "assistant/ui/logo_view/logo_view.h",
+      "assistant/ui/logo_view/shape/mic_part_shape.cc",
+      "assistant/ui/logo_view/shape/mic_part_shape.h",
+      "assistant/ui/logo_view/shape/shape.cc",
+      "assistant/ui/logo_view/shape/shape.h",
+    ]
+
+    deps += [ "//chromeos/assistant/internal/logo_view" ]
+  }
 }
 
 component("ash_with_content") {
   sources = [
     "content/ash_with_content_export.h",
+    "content/content_gpu_support.cc",
+    "content/content_gpu_support.h",
     "content/keyboard_overlay/keyboard_overlay_delegate.cc",
     "content/keyboard_overlay/keyboard_overlay_delegate.h",
     "content/keyboard_overlay/keyboard_overlay_view.cc",
@@ -1286,6 +1409,7 @@ component("ash_with_content") {
     "//ash/public/cpp",
     "//base",
     "//base/third_party/dynamic_annotations",
+    "//components/discardable_memory/public/interfaces",
     "//content/public/browser",
     "//gpu/config",
     "//ipc",
@@ -1379,14 +1503,27 @@ static_library("ash_shell_lib_with_content") {
     ":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",
+    "//ash/components/shortcut_viewer/public/mojom",
+    "//ash/components/tap_visualizer:lib",
+    "//ash/components/tap_visualizer/public/mojom",
     "//ash/public/cpp",
+    "//ash/shell:resources",
     "//base:i18n",
     "//chrome:packed_resources",
     "//chromeos",
+    "//components/discardable_memory/public/interfaces",
+    "//components/services/font:lib",
+    "//components/services/font/public/interfaces",
     "//content",
     "//content/shell:content_shell_lib",
     "//device/bluetooth",
     "//net",
+    "//services/ui/ime/test_ime_driver:lib",
+    "//services/ui/ime/test_ime_driver/public/mojom",
+    "//services/ui/ws2:lib",
     "//skia",
     "//ui/aura",
     "//ui/base",
@@ -1401,6 +1538,15 @@ static_library("ash_shell_lib_with_content") {
   ]
 }
 
+copy("dbus_service_files") {
+  sources = [
+    "dbus/org.chromium.UrlHandlerService.conf",
+  ]
+  outputs = [
+    "$root_out_dir/dbus/{{source_file_part}}",
+  ]
+}
+
 # This target is intended for tests that use content. In general very few tests
 # need or use content and should be placed in |ash_unittests| instead.
 test("ash_content_unittests") {
@@ -1425,8 +1571,8 @@ test("ash_content_unittests") {
     "//chromeos",
     "//chromeos:power_manager_proto",
     "//chromeos:test_support_without_gmock",
+    "//components/account_id",
     "//components/quirks",
-    "//components/signin/core/account_id",
     "//components/user_manager",
     "//content/public/browser",
     "//content/test:test_support",
@@ -1469,22 +1615,26 @@ test("ash_unittests") {
     "accessibility/accessibility_focus_ring_controller_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_list/app_list_presenter_delegate_unittest.cc",
     "app_list/model/app_list_item_list_unittest.cc",
     "app_list/model/app_list_model_unittest.cc",
+    "assistant/assistant_controller_unittest.cc",
     "autoclick/autoclick_unittest.cc",
     "detachable_base/detachable_base_handler_unittest.cc",
     "detachable_base/detachable_base_notification_controller_unittest.cc",
     "dip_unittest.cc",
+    "display/cros_display_config_unittest.cc",
     "display/cursor_window_controller_unittest.cc",
     "display/display_color_manager_unittest.cc",
     "display/display_configuration_controller_unittest.cc",
     "display/display_error_observer_unittest.cc",
     "display/display_manager_unittest.cc",
     "display/display_move_window_util_unittest.cc",
+    "display/display_prefs_unittest.cc",
     "display/display_util_unittest.cc",
     "display/extended_mouse_warp_controller_unittest.cc",
     "display/mirror_window_controller_unittest.cc",
@@ -1501,6 +1651,8 @@ test("ash_unittests") {
     "drag_drop/drag_drop_controller_unittest.cc",
     "drag_drop/drag_drop_tracker_unittest.cc",
     "drag_drop/drag_image_view_unittest.cc",
+    "events/keyboard_driven_event_rewriter_unittest.cc",
+    "events/spoken_feedback_event_rewriter_unittest.cc",
     "extended_desktop_unittest.cc",
     "first_run/first_run_helper_unittest.cc",
     "focus_cycler_unittest.cc",
@@ -1556,6 +1708,7 @@ test("ash_unittests") {
     "multi_device_setup/multi_device_notification_presenter_unittest.cc",
     "mus_property_mirror_ash_unittest.cc",
     "pointer_watcher_adapter_classic_unittest.cc",
+    "policy/policy_recommendation_restorer_unittest.cc",
     "root_window_controller_unittest.cc",
     "rotator/screen_rotation_animation_unittest.cc",
     "rotator/screen_rotation_animator_unittest.cc",
@@ -1579,6 +1732,8 @@ test("ash_unittests") {
     "shell_unittest.cc",
     "sticky_keys/sticky_keys_overlay_unittest.cc",
     "sticky_keys/sticky_keys_unittest.cc",
+    "system/accessibility/dictation_button_tray_unittest.cc",
+    "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",
@@ -1592,10 +1747,18 @@ test("ash_unittests") {
     "system/ime_menu/ime_menu_tray_unittest.cc",
     "system/keyboard_brightness/tray_keyboard_brightness_unittest.cc",
     "system/media_security/multi_profile_media_tray_item_unittest.cc",
+    "system/message_center/arc/arc_notification_content_view_unittest.cc",
+    "system/message_center/arc/arc_notification_manager_unittest.cc",
+    "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/notification_tray_unittest.cc",
+    "system/message_center/session_state_notification_blocker_unittest.cc",
     "system/network/network_icon_unittest.cc",
     "system/network/sms_observer_unittest.cc",
     "system/network/tray_network_unittest.cc",
     "system/network/vpn_list_unittest.cc",
+    "system/network/wifi_toggle_notification_controller_unittest.cc",
     "system/night_light/night_light_controller_unittest.cc",
     "system/night_light/time_of_day_unittest.cc",
     "system/night_light/tray_night_light_unittest.cc",
@@ -1613,10 +1776,10 @@ test("ash_unittests") {
     "system/power/power_button_controller_unittest.cc",
     "system/power/power_button_screenshot_controller_unittest.cc",
     "system/power/power_event_observer_unittest.cc",
+    "system/power/power_notification_controller_unittest.cc",
     "system/power/power_prefs_unittest.cc",
     "system/power/power_status_unittest.cc",
     "system/power/power_status_view_unittest.cc",
-    "system/power/tray_power_unittest.cc",
     "system/power/video_activity_notifier_unittest.cc",
     "system/rotation/rotation_lock_feature_pod_controller_unittest.cc",
     "system/rotation/tray_rotation_lock_unittest.cc",
@@ -1625,14 +1788,17 @@ test("ash_unittests") {
     "system/screen_security/screen_tray_item_unittest.cc",
     "system/session/logout_button_tray_unittest.cc",
     "system/session/logout_confirmation_controller_unittest.cc",
+    "system/session/session_limit_notification_controller_unittest.cc",
     "system/session/tray_session_length_limit_unittest.cc",
     "system/status_area_widget_unittest.cc",
+    "system/supervised/supervised_notification_controller_unittest.cc",
     "system/supervised/tray_supervised_user_unittest.cc",
     "system/tiles/tray_tiles_unittest.cc",
     "system/toast/toast_manager_unittest.cc",
+    "system/tracing_notification_controller_unittest.cc",
     "system/tray/size_range_layout_unittest.cc",
     "system/tray/system_tray_unittest.cc",
-    "system/tray/tray_details_view_unittest.cc",
+    "system/tray/tray_detailed_view_unittest.cc",
     "system/tray/tray_event_filter_unittest.cc",
     "system/tray/tray_info_label_unittest.cc",
     "system/tray/tri_view_unittest.cc",
@@ -1643,12 +1809,10 @@ test("ash_unittests") {
     "system/unified/feature_pods_container_view_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/update/tray_update_unittest.cc",
+    "system/update/update_notification_controller_unittest.cc",
     "system/user/tray_user_unittest.cc",
-    "system/web_notification/ash_popup_alignment_delegate_unittest.cc",
-    "system/web_notification/inactive_user_notification_blocker_unittest.cc",
-    "system/web_notification/session_state_notification_blocker_unittest.cc",
-    "system/web_notification/web_notification_tray_unittest.cc",
     "test/ash_test_helper_unittest.cc",
     "test/ash_unittests.cc",
     "tooltips/tooltip_controller_unittest.cc",
@@ -1690,6 +1854,7 @@ test("ash_unittests") {
     "wm/screen_pinning_controller_unittest.cc",
     "wm/session_state_animator_impl_unittest.cc",
     "wm/splitview/split_view_controller_unittest.cc",
+    "wm/splitview/split_view_highlight_view_unittest.cc",
     "wm/stacking_controller_unittest.cc",
     "wm/system_gesture_event_filter_unittest.cc",
     "wm/system_modal_container_layout_manager_unittest.cc",
@@ -1700,6 +1865,7 @@ test("ash_unittests") {
     "wm/video_detector_unittest.cc",
     "wm/window_animations_unittest.cc",
     "wm/window_cycle_controller_unittest.cc",
+    "wm/window_dimmer_unittest.cc",
     "wm/window_manager_unittest.cc",
     "wm/window_modality_controller_unittest.cc",
     "wm/window_positioner_unittest.cc",
@@ -1725,13 +1891,15 @@ test("ash_unittests") {
     "//ash/autoclick/common:autoclick",
     "//ash/components/fast_ink",
     "//ash/components/fast_ink:unit_tests",
-    "//ash/components/shortcut_viewer:ksv_unittests",
+    "//ash/components/shortcut_viewer:unit_tests",
+    "//ash/components/tap_visualizer:unit_tests",
     "//ash/public/cpp",
     "//ash/public/cpp:unit_tests",
     "//ash/public/cpp/vector_icons",
-    "//ash/resources",
     "//ash/resources/vector_icons",
     "//ash/strings",
+    "//ash/system/message_center/arc",
+    "//ash/system/message_center/arc:test_support",
     "//ash/touch_hud",
     "//base",
     "//base/test:test_support",
@@ -1739,10 +1907,15 @@ test("ash_unittests") {
     "//chromeos:power_manager_proto",
     "//chromeos:test_support",
     "//chromeos:test_support_without_gmock",
+    "//chromeos/services/multidevice_setup/public/mojom",
+    "//components/account_id",
+    "//components/arc:notification_test_support",
+    "//components/exo",
+    "//components/exo:test_support",
     "//components/password_manager/core/browser:hash_password_manager",
     "//components/prefs:test_support",
     "//components/quirks",
-    "//components/signin/core/account_id",
+    "//components/sync_preferences:test_support",
     "//components/user_manager",
     "//components/user_manager:test_support",
     "//device/bluetooth",
@@ -1792,6 +1965,10 @@ test("ash_unittests") {
     "//url",
   ]
 
+  if (enable_cros_assistant) {
+    deps += [ "//chromeos/services/assistant:test_support" ]
+  }
+
   data_deps = [
     "//ash/resources:ash_test_resources_100_percent",
     "//testing/buildbot/filters:ash_unittests_filters",
@@ -1885,6 +2062,7 @@ static_library("test_support_with_content") {
     "//content/public/browser",
     "//content/test:test_support",
     "//skia",
+    "//ui/views/controls/webview",
   ]
 }
 
@@ -1965,6 +2143,8 @@ static_library("test_support_common") {
     "system/power/power_button_test_base.h",
     "system/power/power_event_observer_test_api.cc",
     "system/power/power_event_observer_test_api.h",
+    "system/status_area_widget_test_api.cc",
+    "system/status_area_widget_test_api.h",
     "system/status_area_widget_test_helper.cc",
     "system/status_area_widget_test_helper.h",
     "system/tray/system_tray_test_api.cc",
@@ -1994,6 +2174,8 @@ static_library("test_support_common") {
     "wm/cursor_manager_test_api.h",
     "wm/lock_state_controller_test_api.cc",
     "wm/lock_state_controller_test_api.h",
+    "wm/splitview/split_view_highlight_view_test_api.cc",
+    "wm/splitview/split_view_highlight_view_test_api.h",
     "wm/test_activation_delegate.cc",
     "wm/test_activation_delegate.h",
     "wm/test_child_modal_parent.cc",
@@ -2022,15 +2204,14 @@ static_library("test_support_common") {
     "//ash/components/fast_ink",
     "//ash/public/cpp",
     "//ash/public/interfaces:test_interfaces",
-    "//ash/resources",
     "//base",
     "//base:i18n",
     "//base/test:test_support",
     "//cc:test_support",
     "//chromeos",
     "//chromeos:test_support_without_gmock",
+    "//components/account_id",
     "//components/prefs:test_support",
-    "//components/signin/core/account_id",
     "//components/user_manager:user_manager",
     "//components/viz/test:test_support",
     "//device/bluetooth",
@@ -2124,7 +2305,6 @@ repack("ash_service_resources") {
   output = "$root_out_dir/ash_service_resources.pak"
   sources = [
     "$root_gen_dir/ash/components/resources/ash_components_resources_100_percent.pak",
-    "$root_gen_dir/ash/resources/ash_resources_100_percent.pak",
     "$root_gen_dir/ash/strings/ash_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",
@@ -2135,7 +2315,6 @@ repack("ash_service_resources") {
   ]
   deps = [
     "//ash/components/resources",
-    "//ash/resources",
     "//ash/strings",
     "//ui/chromeos/resources",
     "//ui/chromeos/strings",
@@ -2150,14 +2329,12 @@ repack("ash_service_resources_200") {
   output = "$root_out_dir/ash_service_resources_200.pak"
   sources = [
     "$root_gen_dir/ash/components/resources/ash_components_resources_200_percent.pak",
-    "$root_gen_dir/ash/resources/ash_resources_200_percent.pak",
     "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_200_percent.pak",
     "$root_gen_dir/ui/resources/ui_resources_200_percent.pak",
     "$root_gen_dir/ui/views/resources/views_resources_200_percent.pak",
   ]
   deps = [
     "//ash/components/resources",
-    "//ash/resources",
     "//ui/chromeos/resources",
     "//ui/resources",
     "//ui/views/resources",