BASELINE: Update Chromium to 67.0.3396.47

Change-Id: Idcb1341782e417561a2473eeecc82642dafda5b7
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

1 files changed, 176 insertions, 60 deletions

diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn
index aac61e47b0b..8ef7018a893 100644
--- a/chromium/ash/BUILD.gn
+++ b/chromium/ash/BUILD.gn
@@ -62,6 +62,9 @@ component("ash") {
     "accessibility/accessibility_highlight_layer.h",
     "accessibility/accessibility_layer.cc",
     "accessibility/accessibility_layer.h",
+    "accessibility/accessibility_observer.h",
+    "accessibility/accessibility_panel_layout_manager.cc",
+    "accessibility/accessibility_panel_layout_manager.h",
     "accessibility/default_accessibility_delegate.cc",
     "accessibility/default_accessibility_delegate.h",
     "accessibility/focus_ring_controller.cc",
@@ -72,15 +75,17 @@ component("ash") {
     "accessibility/touch_accessibility_enabler.h",
     "accessibility/touch_exploration_controller.cc",
     "accessibility/touch_exploration_controller.h",
+    "accessibility/touch_exploration_manager.cc",
+    "accessibility/touch_exploration_manager.h",
     "animation/animation_change_type.h",
     "app_list/app_list_controller_impl.cc",
     "app_list/app_list_controller_impl.h",
-    "app_list/app_list_delegate_impl.cc",
-    "app_list/app_list_delegate_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_view_delegate_mash.cc",
     "app_list/app_list_view_delegate_mash.h",
     "ash_constants.cc",
@@ -88,9 +93,11 @@ component("ash") {
     "ash_export.h",
     "ash_layout_constants.cc",
     "ash_layout_constants.h",
-    "ash_touch_exploration_manager_chromeos.cc",
-    "ash_touch_exploration_manager_chromeos.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",
     "autoclick/autoclick_controller.cc",
     "autoclick/autoclick_controller.h",
     "cancel_mode.cc",
@@ -99,21 +106,26 @@ component("ash") {
     "cast_config_controller.h",
     "debug.cc",
     "debug.h",
+    "detachable_base/detachable_base_handler.cc",
+    "detachable_base/detachable_base_handler.h",
+    "detachable_base/detachable_base_notification_controller.cc",
+    "detachable_base/detachable_base_notification_controller.h",
+    "detachable_base/detachable_base_observer.h",
+    "detachable_base/detachable_base_pairing_status.h",
     "disconnected_app_handler.cc",
     "disconnected_app_handler.h",
     "display/ash_display_controller.cc",
     "display/ash_display_controller.h",
     "display/cursor_window_controller.cc",
     "display/cursor_window_controller.h",
+    "display/display_animator.cc",
     "display/display_animator.h",
-    "display/display_animator_chromeos.cc",
-    "display/display_animator_chromeos.h",
-    "display/display_color_manager_chromeos.cc",
-    "display/display_color_manager_chromeos.h",
+    "display/display_color_manager.cc",
+    "display/display_color_manager.h",
     "display/display_configuration_controller.cc",
     "display/display_configuration_controller.h",
-    "display/display_error_observer_chromeos.cc",
-    "display/display_error_observer_chromeos.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_shutdown_observer.cc",
@@ -139,16 +151,16 @@ component("ash") {
     "display/persistent_window_controller.h",
     "display/persistent_window_info.cc",
     "display/persistent_window_info.h",
-    "display/projecting_observer_chromeos.cc",
-    "display/projecting_observer_chromeos.h",
+    "display/projecting_observer.cc",
+    "display/projecting_observer.h",
     "display/resolution_notification_controller.cc",
     "display/resolution_notification_controller.h",
     "display/root_window_transformers.cc",
     "display/root_window_transformers.h",
     "display/screen_ash.cc",
     "display/screen_ash.h",
-    "display/screen_orientation_controller_chromeos.cc",
-    "display/screen_orientation_controller_chromeos.h",
+    "display/screen_orientation_controller.cc",
+    "display/screen_orientation_controller.h",
     "display/screen_position_controller.cc",
     "display/screen_position_controller.h",
     "display/shared_display_edge_indicator.cc",
@@ -169,18 +181,10 @@ component("ash") {
     "drag_drop/drag_image_view.h",
     "event_matcher_util.cc",
     "event_matcher_util.h",
-    "fast_ink/fast_ink_pointer_controller.cc",
-    "fast_ink/fast_ink_pointer_controller.h",
-    "fast_ink/fast_ink_points.cc",
-    "fast_ink/fast_ink_points.h",
-    "fast_ink/fast_ink_view.cc",
-    "fast_ink/fast_ink_view.h",
     "first_run/desktop_cleaner.cc",
     "first_run/desktop_cleaner.h",
     "first_run/first_run_helper.cc",
     "first_run/first_run_helper.h",
-    "first_run/first_run_helper_impl.cc",
-    "first_run/first_run_helper_impl.h",
     "focus_cycler.cc",
     "focus_cycler.h",
     "frame/caption_buttons/caption_button_types.h",
@@ -202,10 +206,14 @@ component("ash") {
     "frame/frame_border_hit_test.cc",
     "frame/frame_border_hit_test.h",
     "frame/frame_header.h",
+    "frame/frame_header_origin_text.cc",
+    "frame/frame_header_origin_text.h",
     "frame/frame_header_util.cc",
     "frame/frame_header_util.h",
     "frame/header_view.cc",
     "frame/header_view.h",
+    "frame/wide_frame_view.cc",
+    "frame/wide_frame_view.h",
     "high_contrast/high_contrast_controller.cc",
     "high_contrast/high_contrast_controller.h",
     "highlighter/highlighter_controller.cc",
@@ -265,12 +273,15 @@ component("ash") {
     "lock_screen_action/lock_screen_note_display_state_handler.h",
     "lock_screen_action/lock_screen_note_launcher.cc",
     "lock_screen_action/lock_screen_note_launcher.h",
-    "login/lock_screen_apps_focus_observer.h",
     "login/login_screen_controller.cc",
     "login/login_screen_controller.h",
+    "login/login_screen_controller_observer.cc",
+    "login/login_screen_controller_observer.h",
     "login/ui/animated_rounded_image_view.cc",
     "login/ui/animated_rounded_image_view.h",
     "login/ui/animation_frame.h",
+    "login/ui/arrow_button_view.cc",
+    "login/ui/arrow_button_view.h",
     "login/ui/hover_notifier.cc",
     "login/ui/hover_notifier.h",
     "login/ui/image_parser.cc",
@@ -289,16 +300,24 @@ component("ash") {
     "login/ui/login_auth_user_view.h",
     "login/ui/login_base_bubble_view.cc",
     "login/ui/login_base_bubble_view.h",
+    "login/ui/login_big_user_view.cc",
+    "login/ui/login_big_user_view.h",
     "login/ui/login_bubble.cc",
     "login/ui/login_bubble.h",
     "login/ui/login_button.cc",
     "login/ui/login_button.h",
     "login/ui/login_data_dispatcher.cc",
     "login/ui/login_data_dispatcher.h",
+    "login/ui/login_detachable_base_model.cc",
+    "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_password_view.cc",
     "login/ui/login_password_view.h",
     "login/ui/login_pin_view.cc",
     "login/ui/login_pin_view.h",
+    "login/ui/login_public_account_user_view.cc",
+    "login/ui/login_public_account_user_view.h",
     "login/ui/login_user_view.cc",
     "login/ui/login_user_view.h",
     "login/ui/non_accessible_view.cc",
@@ -354,6 +373,8 @@ component("ash") {
     "metrics/user_metrics_recorder.h",
     "mojo_interface_factory.cc",
     "mojo_interface_factory.h",
+    "multi_device_setup/multi_device_notification_presenter.cc",
+    "multi_device_setup/multi_device_notification_presenter.h",
     "multi_profile_uma.cc",
     "multi_profile_uma.h",
     "network_connect_delegate_mus.cc",
@@ -384,6 +405,8 @@ component("ash") {
     "session/multiprofiles_intro_dialog.h",
     "session/session_aborted_dialog.cc",
     "session/session_aborted_dialog.h",
+    "session/session_activation_observer_holder.cc",
+    "session/session_activation_observer_holder.h",
     "session/session_controller.cc",
     "session/session_controller.h",
     "session/session_observer.cc",
@@ -472,13 +495,18 @@ component("ash") {
     "sticky_keys/sticky_keys_overlay.cc",
     "sticky_keys/sticky_keys_overlay.h",
     "sticky_keys/sticky_keys_state.h",
-    "system/accessibility_observer.h",
     "system/audio/audio_detailed_view.cc",
     "system/audio/audio_detailed_view.h",
     "system/audio/tray_audio.cc",
     "system/audio/tray_audio.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_feature_pod_controller.cc",
+    "system/bluetooth/bluetooth_feature_pod_controller.h",
     "system/bluetooth/bluetooth_notification_controller.cc",
     "system/bluetooth/bluetooth_notification_controller.h",
     "system/bluetooth/bluetooth_observer.h",
@@ -492,7 +520,13 @@ component("ash") {
     "system/brightness/brightness_controller_chromeos.h",
     "system/brightness/tray_brightness.cc",
     "system/brightness/tray_brightness.h",
+    "system/brightness/unified_brightness_slider_controller.cc",
+    "system/brightness/unified_brightness_slider_controller.h",
+    "system/brightness/unified_brightness_view.cc",
+    "system/brightness/unified_brightness_view.h",
     "system/brightness_control_delegate.h",
+    "system/caps_lock_notification_controller.cc",
+    "system/caps_lock_notification_controller.h",
     "system/cast/tray_cast.cc",
     "system/cast/tray_cast.h",
     "system/date/clock_observer.h",
@@ -513,6 +547,8 @@ component("ash") {
     "system/enterprise/tray_enterprise.h",
     "system/flag_warning/flag_warning_tray.cc",
     "system/flag_warning/flag_warning_tray.h",
+    "system/ime/ime_feature_pod_controller.cc",
+    "system/ime/ime_feature_pod_controller.h",
     "system/ime/ime_observer.h",
     "system/ime/tray_ime_chromeos.cc",
     "system/ime/tray_ime_chromeos.h",
@@ -529,6 +565,20 @@ 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/model/clock_model.cc",
+    "system/model/clock_model.h",
+    "system/model/enterprise_domain_model.cc",
+    "system/model/enterprise_domain_model.h",
+    "system/model/system_tray_model.cc",
+    "system/model/system_tray_model.h",
+    "system/model/tracing_model.cc",
+    "system/model/tracing_model.h",
+    "system/model/update_model.cc",
+    "system/model/update_model.h",
+    "system/network/network_feature_pod_button.cc",
+    "system/network/network_feature_pod_button.h",
+    "system/network/network_feature_pod_controller.cc",
+    "system/network/network_feature_pod_controller.h",
     "system/network/network_icon.cc",
     "system/network/network_icon.h",
     "system/network/network_icon_animation.cc",
@@ -552,6 +602,8 @@ component("ash") {
     "system/network/tray_network_state_observer.h",
     "system/network/tray_vpn.cc",
     "system/network/tray_vpn.h",
+    "system/network/vpn_feature_pod_controller.cc",
+    "system/network/vpn_feature_pod_controller.h",
     "system/network/vpn_list.cc",
     "system/network/vpn_list.h",
     "system/network/vpn_list_view.cc",
@@ -560,6 +612,8 @@ component("ash") {
     "system/networking_config_delegate.h",
     "system/night_light/night_light_controller.cc",
     "system/night_light/night_light_controller.h",
+    "system/night_light/night_light_feature_pod_controller.cc",
+    "system/night_light/night_light_feature_pod_controller.h",
     "system/night_light/night_light_toggle_button.cc",
     "system/night_light/night_light_toggle_button.h",
     "system/night_light/time_of_day.cc",
@@ -616,18 +670,20 @@ component("ash") {
     "system/power/power_button_screenshot_controller.h",
     "system/power/power_event_observer.cc",
     "system/power/power_event_observer.h",
+    "system/power/power_prefs.cc",
+    "system/power/power_prefs.h",
     "system/power/power_status.cc",
     "system/power/power_status.h",
     "system/power/power_status_view.cc",
     "system/power/power_status_view.h",
     "system/power/scoped_backlights_forced_off.cc",
     "system/power/scoped_backlights_forced_off.h",
-    "system/power/tablet_power_button_controller.cc",
-    "system/power/tablet_power_button_controller.h",
     "system/power/tray_power.cc",
     "system/power/tray_power.h",
     "system/power/video_activity_notifier.cc",
     "system/power/video_activity_notifier.h",
+    "system/rotation/rotation_lock_feature_pod_controller.cc",
+    "system/rotation/rotation_lock_feature_pod_controller.h",
     "system/rotation/tray_rotation_lock.cc",
     "system/rotation/tray_rotation_lock.h",
     "system/screen_layout_observer.cc",
@@ -635,6 +691,8 @@ component("ash") {
     "system/screen_security/screen_capture_observer.h",
     "system/screen_security/screen_capture_tray_item.cc",
     "system/screen_security/screen_capture_tray_item.h",
+    "system/screen_security/screen_security_notification_controller.cc",
+    "system/screen_security/screen_security_notification_controller.h",
     "system/screen_security/screen_share_observer.h",
     "system/screen_security/screen_share_tray_item.cc",
     "system/screen_security/screen_share_tray_item.h",
@@ -656,8 +714,6 @@ component("ash") {
     "system/status_area_widget_delegate.h",
     "system/supervised/tray_supervised_user.cc",
     "system/supervised/tray_supervised_user.h",
-    "system/system_clock_observer.cc",
-    "system/system_clock_observer.h",
     "system/system_tray_focus_observer.h",
     "system/tiles/tiles_default_view.cc",
     "system/tiles/tiles_default_view.h",
@@ -729,16 +785,38 @@ component("ash") {
     "system/tray_drag_controller.h",
     "system/tray_tracing.cc",
     "system/tray_tracing.h",
+    "system/unified/accessibility_feature_pod_controller.cc",
+    "system/unified/accessibility_feature_pod_controller.h",
+    "system/unified/collapse_button.cc",
+    "system/unified/collapse_button.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/quiet_mode_feature_pod_controller.cc",
+    "system/unified/quiet_mode_feature_pod_controller.h",
+    "system/unified/sign_out_button.cc",
+    "system/unified/sign_out_button.h",
     "system/unified/top_shortcut_button.cc",
     "system/unified/top_shortcut_button.h",
     "system/unified/top_shortcuts_view.cc",
     "system/unified/top_shortcuts_view.h",
+    "system/unified/unified_message_center_view.cc",
+    "system/unified/unified_message_center_view.h",
+    "system/unified/unified_slider_view.cc",
+    "system/unified/unified_slider_view.h",
+    "system/unified/unified_system_info_view.cc",
+    "system/unified/unified_system_info_view.h",
     "system/unified/unified_system_tray.cc",
     "system/unified/unified_system_tray.h",
     "system/unified/unified_system_tray_bubble.cc",
     "system/unified/unified_system_tray_bubble.h",
     "system/unified/unified_system_tray_controller.cc",
     "system/unified/unified_system_tray_controller.h",
+    "system/unified/unified_system_tray_model.cc",
+    "system/unified/unified_system_tray_model.h",
     "system/unified/unified_system_tray_view.cc",
     "system/unified/unified_system_tray_view.h",
     "system/update/tray_update.cc",
@@ -799,8 +877,16 @@ component("ash") {
     "wallpaper/wallpaper_controller.cc",
     "wallpaper/wallpaper_controller.h",
     "wallpaper/wallpaper_controller_observer.h",
-    "wallpaper/wallpaper_decoder.cc",
-    "wallpaper/wallpaper_decoder.h",
+    "wallpaper/wallpaper_info.h",
+    "wallpaper/wallpaper_utils/wallpaper_color_calculator.cc",
+    "wallpaper/wallpaper_utils/wallpaper_color_calculator.h",
+    "wallpaper/wallpaper_utils/wallpaper_color_calculator_observer.h",
+    "wallpaper/wallpaper_utils/wallpaper_color_extraction_result.h",
+    "wallpaper/wallpaper_utils/wallpaper_decoder.cc",
+    "wallpaper/wallpaper_utils/wallpaper_decoder.h",
+    "wallpaper/wallpaper_utils/wallpaper_resizer.cc",
+    "wallpaper/wallpaper_utils/wallpaper_resizer.h",
+    "wallpaper/wallpaper_utils/wallpaper_resizer_observer.h",
     "wallpaper/wallpaper_view.cc",
     "wallpaper/wallpaper_view.h",
     "wallpaper/wallpaper_widget_controller.cc",
@@ -937,8 +1023,8 @@ component("ash") {
     "wm/splitview/split_view_controller.h",
     "wm/splitview/split_view_divider.cc",
     "wm/splitview/split_view_divider.h",
-    "wm/splitview/split_view_overview_overlay.cc",
-    "wm/splitview/split_view_overview_overlay.h",
+    "wm/splitview/split_view_drag_indicators.cc",
+    "wm/splitview/split_view_drag_indicators.h",
     "wm/splitview/split_view_utils.cc",
     "wm/splitview/split_view_utils.h",
     "wm/stacking_controller.cc",
@@ -1060,8 +1146,8 @@ component("ash") {
     "//ash/strings",
     "//ash/wayland",
     "//mash/public/mojom",
-    "//mojo/common:common_base",
     "//mojo/common:values_struct_traits",
+    "//mojo/public/cpp/system",
     "//services/ui/common:mus_common",
     "//services/ui/public/cpp",
     "//services/ui/public/cpp/input_devices",
@@ -1082,6 +1168,8 @@ component("ash") {
   deps = [
     "//ash/autoclick/common:autoclick",
     "//ash/components/autoclick/public/mojom",
+    "//ash/components/cursor",
+    "//ash/components/fast_ink",
     "//ash/components/quick_launch/public/mojom",
     "//ash/touch_hud",
     "//base",
@@ -1092,6 +1180,9 @@ component("ash") {
     "//cc/paint:paint",
     "//chromeos",
     "//chromeos:power_manager_proto",
+    "//chromeos/components/proximity_auth/logging",
+    "//chromeos/services/assistant/public/mojom",
+    "//chromeos/services/multidevice_setup/public/mojom",
     "//components/device_event_log",
     "//components/exo",
     "//components/exo/wayland",
@@ -1108,7 +1199,6 @@ component("ash") {
     "//components/vector_icons",
     "//components/viz/host",
     "//components/viz/service",
-    "//components/wallpaper",
     "//device/bluetooth",
     "//extensions/common:common_constants",
     "//gpu/command_buffer/client",
@@ -1121,12 +1211,12 @@ component("ash") {
     "//services/ui/public/interfaces/input_devices",
 
     # TODO(msw): Remove this; only ash_with_content should depend on webkit.
-    "//third_party/WebKit/public:blink_headers",
+    "//ash/app_list/presenter",
+    "//third_party/blink/public:blink_headers",
     "//third_party/icu",
     "//third_party/qcms",
     "//third_party/re2",
     "//ui/accessibility",
-    "//ui/app_list/presenter",
     "//ui/base",
     "//ui/base:ui_data_pack",
     "//ui/base/ime",
@@ -1135,6 +1225,7 @@ component("ash") {
     "//ui/chromeos/resources",
     "//ui/chromeos/strings",
     "//ui/compositor",
+    "//ui/compositor_extra",
     "//ui/display",
     "//ui/display/manager",
     "//ui/display/types",
@@ -1205,7 +1296,7 @@ component("ash_with_content") {
     "//ui/events",
     "//ui/gfx",
     "//ui/gfx/geometry",
-    "//ui/keyboard:keyboard_with_content",
+    "//ui/keyboard",
     "//ui/resources",
     "//ui/strings",
     "//ui/views",
@@ -1221,8 +1312,6 @@ static_library("ash_shell_lib") {
     "../ui/views/test/test_views_delegate_aura.cc",
     "shell/app_list.cc",
     "shell/bubble.cc",
-    "shell/example_app_list_presenter.cc",
-    "shell/example_app_list_presenter.h",
     "shell/example_factory.h",
     "shell/example_session_controller_client.cc",
     "shell/example_session_controller_client.h",
@@ -1253,13 +1342,13 @@ static_library("ash_shell_lib") {
   deps = [
     ":ash",
     ":test_support_without_content",
+    "//ash/app_list/presenter",
+    "//ash/app_list/presenter:test_support",
     "//ash/public/cpp",
     "//base",
     "//base:i18n",
     "//components/user_manager",
     "//skia",
-    "//ui/app_list/presenter",
-    "//ui/app_list/presenter:test_support",
     "//ui/aura",
     "//ui/base",
     "//ui/gfx",
@@ -1289,6 +1378,7 @@ static_library("ash_shell_lib_with_content") {
     ":ash_shell_lib",
     ":ash_with_content",
     ":test_support_without_content",
+    "//ash/app_list/presenter:test_support",
     "//ash/public/cpp",
     "//base:i18n",
     "//chrome:packed_resources",
@@ -1298,7 +1388,6 @@ static_library("ash_shell_lib_with_content") {
     "//device/bluetooth",
     "//net",
     "//skia",
-    "//ui/app_list/presenter:test_support",
     "//ui/aura",
     "//ui/base",
     "//ui/base/ime",
@@ -1342,7 +1431,7 @@ test("ash_content_unittests") {
     "//content/public/browser",
     "//content/test:test_support",
     "//device/bluetooth",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//net",
     "//skia",
     "//testing/gtest",
@@ -1379,16 +1468,21 @@ test("ash_unittests") {
     "accessibility/accessibility_controller_unittest.cc",
     "accessibility/accessibility_focus_ring_controller_unittest.cc",
     "accessibility/accessibility_highlight_controller_unittest.cc",
+    "accessibility/accessibility_panel_layout_manager_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",
-    "ash_touch_exploration_manager_chromeos_unittest.cc",
+    "app_list/model/app_list_item_list_unittest.cc",
+    "app_list/model/app_list_model_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/cursor_window_controller_unittest.cc",
-    "display/display_color_manager_chromeos_unittest.cc",
+    "display/display_color_manager_unittest.cc",
     "display/display_configuration_controller_unittest.cc",
-    "display/display_error_observer_chromeos_unittest.cc",
+    "display/display_error_observer_unittest.cc",
     "display/display_manager_unittest.cc",
     "display/display_move_window_util_unittest.cc",
     "display/display_util_unittest.cc",
@@ -1396,7 +1490,7 @@ test("ash_unittests") {
     "display/mirror_window_controller_unittest.cc",
     "display/mouse_cursor_event_filter_unittest.cc",
     "display/persistent_window_controller_unittest.cc",
-    "display/projecting_observer_chromeos_unittest.cc",
+    "display/projecting_observer_unittest.cc",
     "display/resolution_notification_controller_unittest.cc",
     "display/root_window_transformers_unittest.cc",
     "display/screen_ash_unittest.cc",
@@ -1408,10 +1502,10 @@ test("ash_unittests") {
     "drag_drop/drag_drop_tracker_unittest.cc",
     "drag_drop/drag_image_view_unittest.cc",
     "extended_desktop_unittest.cc",
-    "fast_ink/fast_ink_points_unittest.cc",
     "first_run/first_run_helper_unittest.cc",
     "focus_cycler_unittest.cc",
     "frame/caption_buttons/frame_caption_button_container_view_unittest.cc",
+    "frame/caption_buttons/frame_caption_button_unittest.cc",
     "frame/caption_buttons/frame_size_button_unittest.cc",
     "frame/custom_frame_view_ash_unittest.cc",
     "frame/default_frame_header_unittest.cc",
@@ -1426,11 +1520,14 @@ test("ash_unittests") {
     "login/login_screen_controller_unittest.cc",
     "login/mock_login_screen_client.cc",
     "login/mock_login_screen_client.h",
+    "login/ui/fake_login_detachable_base_model.cc",
+    "login/ui/fake_login_detachable_base_model.h",
     "login/ui/lock_contents_view_unittest.cc",
     "login/ui/lock_screen_sanity_unittest.cc",
     "login/ui/lock_window_unittest.cc",
     "login/ui/login_auth_user_view_unittest.cc",
     "login/ui/login_bubble_unittest.cc",
+    "login/ui/login_expanded_public_account_view_unittest.cc",
     "login/ui/login_keyboard_test_base.cc",
     "login/ui/login_keyboard_test_base.h",
     "login/ui/login_password_view_test.cc",
@@ -1456,6 +1553,7 @@ test("ash_unittests") {
     "metrics/task_switch_metrics_recorder_unittest.cc",
     "metrics/task_switch_time_tracker_unittest.cc",
     "metrics/user_metrics_recorder_unittest.cc",
+    "multi_device_setup/multi_device_notification_presenter_unittest.cc",
     "mus_property_mirror_ash_unittest.cc",
     "pointer_watcher_adapter_classic_unittest.cc",
     "root_window_controller_unittest.cc",
@@ -1485,6 +1583,7 @@ test("ash_unittests") {
     "system/bluetooth/bluetooth_power_controller_unittest.cc",
     "system/bluetooth/tray_bluetooth_helper_unittest.cc",
     "system/brightness/tray_brightness_unittest.cc",
+    "system/caps_lock_notification_controller_unittest.cc",
     "system/date/date_view_unittest.cc",
     "system/date/system_info_default_view_unittest.cc",
     "system/enterprise/tray_enterprise_unittest.cc",
@@ -1511,15 +1610,18 @@ test("ash_unittests") {
     "system/palette/tools/screenshot_unittest.cc",
     "system/power/backlights_forced_off_setter_unittest.cc",
     "system/power/peripheral_battery_notifier_unittest.cc",
+    "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_prefs_unittest.cc",
     "system/power/power_status_unittest.cc",
     "system/power/power_status_view_unittest.cc",
-    "system/power/tablet_power_button_controller_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",
     "system/screen_layout_observer_unittest.cc",
+    "system/screen_security/screen_security_notification_controller_unittest.cc",
     "system/screen_security/screen_tray_item_unittest.cc",
     "system/session/logout_button_tray_unittest.cc",
     "system/session/logout_confirmation_controller_unittest.cc",
@@ -1537,6 +1639,10 @@ test("ash_unittests") {
     "system/tray_accessibility_unittest.cc",
     "system/tray_caps_lock_unittest.cc",
     "system/tray_tracing_unittest.cc",
+    "system/unified/accessibility_feature_pod_controller_unittest.cc",
+    "system/unified/feature_pods_container_view_unittest.cc",
+    "system/unified/top_shortcuts_view_unittest.cc",
+    "system/unified/unified_system_info_view_unittest.cc",
     "system/update/tray_update_unittest.cc",
     "system/user/tray_user_unittest.cc",
     "system/web_notification/ash_popup_alignment_delegate_unittest.cc",
@@ -1555,6 +1661,9 @@ test("ash_unittests") {
     "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",
+    "wallpaper/wallpaper_utils/wallpaper_resizer_unittest.cc",
+    "wallpaper/wallpaper_window_state_manager_unittest.cc",
     "window_manager_common_unittests.cc",
     "window_user_data_unittest.cc",
     "wm/always_on_top_controller_unittest.cc",
@@ -1611,7 +1720,11 @@ test("ash_unittests") {
   deps = [
     ":ash",
     ":test_support_without_content",
+    "//ash/app_list/presenter",
+    "//ash/app_list/presenter:test_support",
     "//ash/autoclick/common:autoclick",
+    "//ash/components/fast_ink",
+    "//ash/components/fast_ink:unit_tests",
     "//ash/components/shortcut_viewer:ksv_unittests",
     "//ash/public/cpp",
     "//ash/public/cpp:unit_tests",
@@ -1633,7 +1746,7 @@ test("ash_unittests") {
     "//components/user_manager",
     "//components/user_manager:test_support",
     "//device/bluetooth",
-    "//mojo/edk/system",
+    "//mojo/edk",
     "//net:net",
     "//services/ui/public/cpp/input_devices:test_support",
     "//services/ui/public/interfaces",
@@ -1643,8 +1756,6 @@ test("ash_unittests") {
     "//third_party/icu",
     "//ui/accessibility",
     "//ui/app_list:test_support",
-    "//ui/app_list/presenter",
-    "//ui/app_list/presenter:test_support",
     "//ui/aura",
     "//ui/aura:test_support",
     "//ui/base",
@@ -1709,7 +1820,7 @@ test("ash_perftests") {
     "//ash/public/cpp",
     "//base/test:test_support",
     "//cc/base",
-    "//mojo/edk/embedder:headers",
+    "//mojo/edk",
     "//testing/gtest",
     "//testing/perf",
     "//ui/aura",
@@ -1788,8 +1899,10 @@ static_library("test_support_common") {
   sources = [
     "accessibility/test_accessibility_controller_client.cc",
     "accessibility/test_accessibility_controller_client.h",
-    "app_list/test_app_list_presenter_impl.cc",
-    "app_list/test_app_list_presenter_impl.h",
+    "app_list/test/app_list_test_helper.cc",
+    "app_list/test/app_list_test_helper.h",
+    "app_list/test/test_app_list_client.cc",
+    "app_list/test/test_app_list_client.h",
     "display/display_configuration_controller_test_api.cc",
     "display/display_configuration_controller_test_api.h",
     "display/mirror_window_test_api.cc",
@@ -1800,6 +1913,8 @@ static_library("test_support_common") {
     "highlighter/highlighter_controller_test_api.h",
     "ime/test_ime_controller.cc",
     "ime/test_ime_controller.h",
+    "ime/test_ime_controller_client.cc",
+    "ime/test_ime_controller_client.h",
     "keyboard/test_keyboard_ui.cc",
     "keyboard/test_keyboard_ui.h",
     "laser/laser_pointer_controller_test_api.cc",
@@ -1842,14 +1957,14 @@ static_library("test_support_common") {
     "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",
+    "system/power/power_button_controller_test_api.h",
     "system/power/power_button_screenshot_controller_test_api.cc",
     "system/power/power_button_screenshot_controller_test_api.h",
     "system/power/power_button_test_base.cc",
     "system/power/power_button_test_base.h",
     "system/power/power_event_observer_test_api.cc",
     "system/power/power_event_observer_test_api.h",
-    "system/power/tablet_power_button_controller_test_api.cc",
-    "system/power/tablet_power_button_controller_test_api.h",
     "system/status_area_widget_test_helper.cc",
     "system/status_area_widget_test_helper.h",
     "system/tray/system_tray_test_api.cc",
@@ -1897,11 +2012,14 @@ static_library("test_support_common") {
   public_deps = [
     "//ash",
     "//testing/gtest",
-    "//third_party/WebKit/public:blink_headers",
+    "//third_party/blink/public:blink_headers",
     "//ui/display:display_manager_test_api",
   ]
   deps = [
     "//ash",
+    "//ash/app_list/presenter",
+    "//ash/app_list/presenter:test_support",
+    "//ash/components/fast_ink",
     "//ash/public/cpp",
     "//ash/public/interfaces:test_interfaces",
     "//ash/resources",
@@ -1923,8 +2041,6 @@ static_library("test_support_common") {
     "//testing/gtest",
     "//ui/accessibility",
     "//ui/app_list:test_support",
-    "//ui/app_list/presenter",
-    "//ui/app_list/presenter:test_support",
     "//ui/aura",
     "//ui/aura:test_support",
     "//ui/base:test_support",