BASELINE: Update Chromium to 61.0.3163.99

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

1 files changed, 387 insertions, 104 deletions

diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn
index 793a7e5956c..6af7b3d742a 100644
--- a/chromium/ash/BUILD.gn
+++ b/chromium/ash/BUILD.gn
@@ -17,13 +17,13 @@ component("ash") {
   sources = [
     "accelerators/accelerator_commands.cc",
     "accelerators/accelerator_commands.h",
-    "accelerators/accelerator_commands_aura.cc",
-    "accelerators/accelerator_commands_aura.h",
+    "accelerators/accelerator_commands_classic.cc",
+    "accelerators/accelerator_commands_classic.h",
     "accelerators/accelerator_controller.cc",
     "accelerators/accelerator_controller.h",
     "accelerators/accelerator_controller_delegate.h",
-    "accelerators/accelerator_controller_delegate_aura.cc",
-    "accelerators/accelerator_controller_delegate_aura.h",
+    "accelerators/accelerator_controller_delegate_classic.cc",
+    "accelerators/accelerator_controller_delegate_classic.h",
     "accelerators/accelerator_delegate.cc",
     "accelerators/accelerator_delegate.h",
     "accelerators/accelerator_router.cc",
@@ -61,12 +61,6 @@ component("ash") {
     "ash_touch_exploration_manager_chromeos.cc",
     "ash_touch_exploration_manager_chromeos.h",
     "ash_view_ids.h",
-    "aura/key_event_watcher_aura.cc",
-    "aura/key_event_watcher_aura.h",
-    "aura/pointer_watcher_adapter.cc",
-    "aura/pointer_watcher_adapter.h",
-    "aura/shell_port_classic.cc",
-    "aura/shell_port_classic.h",
     "autoclick/autoclick_controller.cc",
     "autoclick/autoclick_controller.h",
     "cancel_mode.cc",
@@ -79,19 +73,8 @@ component("ash") {
     "default_accessibility_delegate.h",
     "default_wallpaper_delegate.cc",
     "default_wallpaper_delegate.h",
-    "devtools/ash_devtools_css_agent.cc",
-    "devtools/ash_devtools_css_agent.h",
-    "devtools/ash_devtools_dom_agent.cc",
-    "devtools/ash_devtools_dom_agent.h",
-    "devtools/ui_element.cc",
-    "devtools/ui_element.h",
-    "devtools/ui_element_delegate.h",
-    "devtools/view_element.cc",
-    "devtools/view_element.h",
-    "devtools/widget_element.cc",
-    "devtools/widget_element.h",
-    "devtools/window_element.cc",
-    "devtools/window_element.h",
+    "display/ash_display_controller.cc",
+    "display/ash_display_controller.h",
     "display/cursor_window_controller.cc",
     "display/cursor_window_controller.h",
     "display/display_animator.h",
@@ -142,6 +125,12 @@ component("ash") {
     "drag_drop/drag_drop_tracker.h",
     "drag_drop/drag_image_view.cc",
     "drag_drop/drag_image_view.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",
@@ -174,6 +163,15 @@ component("ash") {
     "gpu_support_stub.h",
     "high_contrast/high_contrast_controller.cc",
     "high_contrast/high_contrast_controller.h",
+    "highlighter/highlighter_controller.cc",
+    "highlighter/highlighter_controller.h",
+    "highlighter/highlighter_gesture_util.cc",
+    "highlighter/highlighter_gesture_util.h",
+    "highlighter/highlighter_result_view.cc",
+    "highlighter/highlighter_result_view.h",
+    "highlighter/highlighter_selection_observer.h",
+    "highlighter/highlighter_view.cc",
+    "highlighter/highlighter_view.h",
     "host/ash_window_tree_host.cc",
     "host/ash_window_tree_host.h",
     "host/ash_window_tree_host_init_params.h",
@@ -186,9 +184,9 @@ component("ash") {
     "host/root_window_transformer.h",
     "host/transformer_helper.cc",
     "host/transformer_helper.h",
+    "ime/ime_controller.cc",
+    "ime/ime_controller.h",
     "ime/ime_switch_type.h",
-    "key_event_watcher.cc",
-    "key_event_watcher.h",
     "keyboard/keyboard_observer_register.cc",
     "keyboard/keyboard_observer_register.h",
     "keyboard/keyboard_ui.cc",
@@ -196,8 +194,6 @@ component("ash") {
     "keyboard/keyboard_ui_observer.h",
     "laser/laser_pointer_controller.cc",
     "laser/laser_pointer_controller.h",
-    "laser/laser_pointer_points.cc",
-    "laser/laser_pointer_points.h",
     "laser/laser_pointer_view.cc",
     "laser/laser_pointer_view.h",
     "laser/laser_segment_utils.cc",
@@ -210,10 +206,23 @@ component("ash") {
     "login/lock_screen_controller.h",
     "login/ui/lock_contents_view.cc",
     "login/ui/lock_contents_view.h",
+    "login/ui/lock_debug_view.cc",
+    "login/ui/lock_debug_view.h",
     "login/ui/lock_screen.cc",
     "login/ui/lock_screen.h",
     "login/ui/lock_window.cc",
     "login/ui/lock_window.h",
+    "login/ui/login_auth_user_view.cc",
+    "login/ui/login_auth_user_view.h",
+    "login/ui/login_constants.h",
+    "login/ui/login_data_dispatcher.cc",
+    "login/ui/login_data_dispatcher.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_user_view.cc",
+    "login/ui/login_user_view.h",
     "login_status.h",
     "magnifier/magnification_controller.cc",
     "magnifier/magnification_controller.h",
@@ -241,6 +250,8 @@ component("ash") {
     "new_window_controller.cc",
     "new_window_controller.h",
     "palette_delegate.h",
+    "pointer_watcher_adapter_classic.cc",
+    "pointer_watcher_adapter_classic.h",
     "root_window_controller.cc",
     "root_window_controller.h",
     "root_window_settings.cc",
@@ -261,18 +272,6 @@ component("ash") {
     "session/session_controller.h",
     "session/session_observer.cc",
     "session/session_observer.h",
-    "session/session_state_delegate.h",
-    "shared/immersive_context.cc",
-    "shared/immersive_context.h",
-    "shared/immersive_focus_watcher.h",
-    "shared/immersive_fullscreen_controller.cc",
-    "shared/immersive_fullscreen_controller.h",
-    "shared/immersive_fullscreen_controller_delegate.h",
-    "shared/immersive_gesture_handler.h",
-    "shared/immersive_handler_factory.cc",
-    "shared/immersive_handler_factory.h",
-    "shared/immersive_revealed_lock.cc",
-    "shared/immersive_revealed_lock.h",
     "shelf/app_list_button.cc",
     "shelf/app_list_button.h",
     "shelf/app_list_shelf_item_delegate.cc",
@@ -307,9 +306,6 @@ component("ash") {
     "shelf/shelf_layout_manager_observer.h",
     "shelf/shelf_locking_manager.cc",
     "shelf/shelf_locking_manager.h",
-    "shelf/shelf_model.cc",
-    "shelf/shelf_model.h",
-    "shelf/shelf_model_observer.h",
     "shelf/shelf_observer.h",
     "shelf/shelf_tooltip_manager.cc",
     "shelf/shelf_tooltip_manager.h",
@@ -323,6 +319,8 @@ component("ash") {
     "shelf/shelf_window_watcher.h",
     "shelf/shelf_window_watcher_item_delegate.cc",
     "shelf/shelf_window_watcher_item_delegate.h",
+    "shelf/voice_interaction_overlay.cc",
+    "shelf/voice_interaction_overlay.h",
     "shell.cc",
     "shell.h",
     "shell_delegate.h",
@@ -330,6 +328,8 @@ component("ash") {
     "shell_observer.h",
     "shell_port.cc",
     "shell_port.h",
+    "shell_port_classic.cc",
+    "shell_port_classic.h",
     "shutdown_controller.cc",
     "shutdown_controller.h",
     "sticky_keys/sticky_keys_controller.cc",
@@ -347,6 +347,8 @@ component("ash") {
     "system/bluetooth/bluetooth_notification_controller.cc",
     "system/bluetooth/bluetooth_notification_controller.h",
     "system/bluetooth/bluetooth_observer.h",
+    "system/bluetooth/bluetooth_power_controller.cc",
+    "system/bluetooth/bluetooth_power_controller.h",
     "system/bluetooth/tray_bluetooth.cc",
     "system/bluetooth/tray_bluetooth.h",
     "system/bluetooth/tray_bluetooth_helper.cc",
@@ -383,9 +385,11 @@ component("ash") {
     "system/ime_menu/ime_list_view.h",
     "system/ime_menu/ime_menu_tray.cc",
     "system/ime_menu/ime_menu_tray.h",
+    "system/keyboard_brightness/keyboard_brightness_controller.cc",
+    "system/keyboard_brightness/keyboard_brightness_controller.h",
+    "system/keyboard_brightness/tray_keyboard_brightness.cc",
+    "system/keyboard_brightness/tray_keyboard_brightness.h",
     "system/keyboard_brightness_control_delegate.h",
-    "system/keyboard_brightness_controller.cc",
-    "system/keyboard_brightness_controller.h",
     "system/locale/locale_notification_controller.cc",
     "system/locale/locale_notification_controller.h",
     "system/lock_screen_action/lock_screen_action_tray.cc",
@@ -423,6 +427,8 @@ component("ash") {
     "system/night_light/night_light_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",
+    "system/night_light/time_of_day.h",
     "system/night_light/tray_night_light.cc",
     "system/night_light/tray_night_light.h",
     "system/overview/overview_button_tray.cc",
@@ -487,7 +493,6 @@ component("ash") {
     "system/session/logout_confirmation_controller.h",
     "system/session/logout_confirmation_dialog.cc",
     "system/session/logout_confirmation_dialog.h",
-    "system/session/session_length_limit_observer.h",
     "system/session/tray_session_length_limit.cc",
     "system/session/tray_session_length_limit.h",
     "system/status_area_focus_observer.h",
@@ -517,8 +522,6 @@ component("ash") {
     "system/tray/actionable_view.h",
     "system/tray/hover_highlight_view.cc",
     "system/tray/hover_highlight_view.h",
-    "system/tray/ime_info.cc",
-    "system/tray/ime_info.h",
     "system/tray/label_tray_view.cc",
     "system/tray/label_tray_view.h",
     "system/tray/size_range_layout.cc",
@@ -551,6 +554,8 @@ component("ash") {
     "system/tray/tray_event_filter.h",
     "system/tray/tray_image_item.cc",
     "system/tray/tray_image_item.h",
+    "system/tray/tray_info_label.cc",
+    "system/tray/tray_info_label.h",
     "system/tray/tray_item_more.cc",
     "system/tray/tray_item_more.h",
     "system/tray/tray_item_view.cc",
@@ -571,6 +576,8 @@ component("ash") {
     "system/tray_accessibility.h",
     "system/tray_caps_lock.cc",
     "system/tray_caps_lock.h",
+    "system/tray_drag_controller.cc",
+    "system/tray_drag_controller.h",
     "system/tray_tracing.cc",
     "system/tray_tracing.h",
     "system/update/tray_update.cc",
@@ -626,8 +633,6 @@ component("ash") {
     "wm/always_on_top_controller.h",
     "wm/ash_focus_rules.cc",
     "wm/ash_focus_rules.h",
-    "wm/ash_native_cursor_manager.cc",
-    "wm/ash_native_cursor_manager.h",
     "wm/boot_splash_screen_chromeos.cc",
     "wm/boot_splash_screen_chromeos.h",
     "wm/container_finder.cc",
@@ -654,12 +659,14 @@ component("ash") {
     "wm/gestures/overview_gesture_handler.h",
     "wm/immersive_context_ash.cc",
     "wm/immersive_context_ash.h",
-    "wm/immersive_focus_watcher_aura.cc",
-    "wm/immersive_focus_watcher_aura.h",
-    "wm/immersive_gesture_handler_aura.cc",
-    "wm/immersive_gesture_handler_aura.h",
+    "wm/immersive_focus_watcher_classic.cc",
+    "wm/immersive_focus_watcher_classic.h",
+    "wm/immersive_gesture_handler_classic.cc",
+    "wm/immersive_gesture_handler_classic.h",
     "wm/immersive_handler_factory_ash.cc",
     "wm/immersive_handler_factory_ash.h",
+    "wm/lock_action_handler_layout_manager.cc",
+    "wm/lock_action_handler_layout_manager.h",
     "wm/lock_layout_manager.cc",
     "wm/lock_layout_manager.h",
     "wm/lock_state_controller.cc",
@@ -667,30 +674,20 @@ component("ash") {
     "wm/lock_state_observer.h",
     "wm/lock_window_state.cc",
     "wm/lock_window_state.h",
-    "wm/maximize_mode/maximize_mode_backdrop_delegate_impl.cc",
-    "wm/maximize_mode/maximize_mode_backdrop_delegate_impl.h",
-    "wm/maximize_mode/maximize_mode_controller.cc",
-    "wm/maximize_mode/maximize_mode_controller.h",
-    "wm/maximize_mode/maximize_mode_event_handler.cc",
-    "wm/maximize_mode/maximize_mode_event_handler.h",
-    "wm/maximize_mode/maximize_mode_event_handler_aura.cc",
-    "wm/maximize_mode/maximize_mode_event_handler_aura.h",
-    "wm/maximize_mode/maximize_mode_window_manager.cc",
-    "wm/maximize_mode/maximize_mode_window_manager.h",
-    "wm/maximize_mode/maximize_mode_window_state.cc",
-    "wm/maximize_mode/maximize_mode_window_state.h",
-    "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h",
-    "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc",
-    "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h",
-    "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc",
-    "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h",
     "wm/mru_window_tracker.cc",
     "wm/mru_window_tracker.h",
+    "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/overlay_event_filter.cc",
     "wm/overlay_event_filter.h",
     "wm/overview/cleanup_animation_observer.cc",
     "wm/overview/cleanup_animation_observer.h",
     "wm/overview/overview_animation_type.h",
+    "wm/overview/scoped_hide_overview_windows.cc",
+    "wm/overview/scoped_hide_overview_windows.h",
     "wm/overview/scoped_overview_animation_settings.cc",
     "wm/overview/scoped_overview_animation_settings.h",
     "wm/overview/scoped_transform_overview_window.cc",
@@ -734,6 +731,8 @@ component("ash") {
     "wm/session_state_animator.h",
     "wm/session_state_animator_impl.cc",
     "wm/session_state_animator_impl.h",
+    "wm/splitview/split_view_controller.cc",
+    "wm/splitview/split_view_controller.h",
     "wm/stacking_controller.cc",
     "wm/stacking_controller.h",
     "wm/switchable_windows.cc",
@@ -747,6 +746,22 @@ component("ash") {
     "wm/system_modal_container_layout_manager.h",
     "wm/system_wallpaper_controller.cc",
     "wm/system_wallpaper_controller.h",
+    "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard.h",
+    "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc",
+    "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_x11.h",
+    "wm/tablet_mode/tablet_mode_backdrop_delegate_impl.cc",
+    "wm/tablet_mode/tablet_mode_backdrop_delegate_impl.h",
+    "wm/tablet_mode/tablet_mode_controller.cc",
+    "wm/tablet_mode/tablet_mode_controller.h",
+    "wm/tablet_mode/tablet_mode_event_handler.cc",
+    "wm/tablet_mode/tablet_mode_event_handler.h",
+    "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_manager.cc",
+    "wm/tablet_mode/tablet_mode_window_manager.h",
+    "wm/tablet_mode/tablet_mode_window_state.cc",
+    "wm/tablet_mode/tablet_mode_window_state.h",
     "wm/toplevel_window_event_handler.cc",
     "wm/toplevel_window_event_handler.h",
     "wm/video_detector.cc",
@@ -759,8 +774,8 @@ component("ash") {
     "wm/window_cycle_controller.cc",
     "wm/window_cycle_controller.h",
     "wm/window_cycle_event_filter.h",
-    "wm/window_cycle_event_filter_aura.cc",
-    "wm/window_cycle_event_filter_aura.h",
+    "wm/window_cycle_event_filter_classic.cc",
+    "wm/window_cycle_event_filter_classic.h",
     "wm/window_cycle_list.cc",
     "wm/window_cycle_list.h",
     "wm/window_dimmer.cc",
@@ -809,8 +824,8 @@ component("ash") {
     "wm/workspace/two_step_edge_cycler.h",
     "wm/workspace/workspace_event_handler.cc",
     "wm/workspace/workspace_event_handler.h",
-    "wm/workspace/workspace_event_handler_aura.cc",
-    "wm/workspace/workspace_event_handler_aura.h",
+    "wm/workspace/workspace_event_handler_classic.cc",
+    "wm/workspace/workspace_event_handler_classic.h",
     "wm/workspace/workspace_layout_manager.cc",
     "wm/workspace/workspace_layout_manager.h",
     "wm/workspace/workspace_types.h",
@@ -818,10 +833,6 @@ component("ash") {
     "wm/workspace/workspace_window_resizer.h",
     "wm/workspace_controller.cc",
     "wm/workspace_controller.h",
-    "wm_display_observer.h",
-    "wm_transient_window_observer.h",
-    "wm_window.cc",
-    "wm_window.h",
   ]
 
   configs += [ "//build/config:precompiled_headers" ]
@@ -830,7 +841,6 @@ component("ash") {
   public_deps = [
     "//ash/resources",
     "//ash/resources/vector_icons",
-    "//ash/shared:app_types",
     "//ash/strings",
   ]
   deps = [
@@ -850,9 +860,7 @@ component("ash") {
     "//components/quirks",
     "//components/session_manager:base",
     "//components/signin/core/account_id",
-    "//components/ui_devtools",
     "//components/user_manager",
-    "//components/vector_icons",
     "//components/wallpaper",
     "//device/bluetooth",
     "//gpu/command_buffer/client",
@@ -862,10 +870,12 @@ component("ash") {
     "//services/preferences/public/cpp",
     "//services/service_manager/public/cpp",
     "//services/ui/public/cpp",
+    "//services/ui/public/cpp/input_devices",
     "//services/ui/public/interfaces",
     "//skia",
 
     # TODO(msw): Remove this; only ash_with_content should depend on webkit.
+    "//components/vector_icons",
     "//third_party/WebKit/public:blink_headers",
     "//third_party/icu",
     "//third_party/qcms",
@@ -896,9 +906,9 @@ component("ash") {
     "//ui/platform_window/stub",
     "//ui/resources",
     "//ui/strings",
-    "//ui/vector_icons",
     "//ui/views",
     "//ui/wm",
+    "//ui/wm/public",
     "//url",
   ]
 
@@ -921,8 +931,8 @@ component("ash") {
     sources -= [
       "host/ash_window_tree_host_x11.cc",
       "host/ash_window_tree_host_x11.h",
-      "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc",
-      "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h",
+      "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc",
+      "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_x11.h",
     ]
   }
 
@@ -932,10 +942,11 @@ component("ash") {
       "//ui/events/ozone:events_ozone",
       "//ui/ozone",
     ]
-  } else {
-    sources -= [
-      "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc",
-      "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h",
+    sources += [
+      "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc",
+      "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h",
+      "wm/tablet_mode/touchpad_and_keyboard_disabler.cc",
+      "wm/tablet_mode/touchpad_and_keyboard_disabler.h",
     ]
   }
 
@@ -1008,6 +1019,8 @@ static_library("ash_shell_lib") {
     "shell/panel_window.h",
     "shell/shell_delegate_impl.cc",
     "shell/shell_delegate_impl.h",
+    "shell/shell_views_delegate.cc",
+    "shell/shell_views_delegate.h",
     "shell/toplevel_window.cc",
     "shell/toplevel_window.h",
     "shell/widgets.cc",
@@ -1027,8 +1040,8 @@ static_library("ash_shell_lib") {
 
   deps = [
     ":ash",
+    ":test_support_without_content",
     "//ash/public/cpp:ash_public_cpp",
-    "//ash/test:test_support_without_content",
     "//base",
     "//base:i18n",
     "//components/user_manager",
@@ -1063,8 +1076,8 @@ static_library("ash_shell_lib_with_content") {
   deps = [
     ":ash_shell_lib",
     ":ash_with_content",
+    ":test_support_without_content",
     "//ash/public/cpp:ash_public_cpp",
-    "//ash/test:test_support_without_content",
     "//base:i18n",
     "//chrome:packed_resources",
     "//chromeos",
@@ -1106,8 +1119,8 @@ test("ash_content_unittests") {
   deps = [
     ":ash",
     ":ash_with_content",
+    ":test_support_with_content",
     "//ash/public/cpp:ash_public_cpp",
-    "//ash/test:test_support_with_content",
     "//base",
     "//base/test:test_support",
     "//chromeos",
@@ -1116,6 +1129,7 @@ test("ash_content_unittests") {
     "//components/quirks",
     "//components/signin/core/account_id",
     "//components/user_manager",
+    "//components/viz/test:test_support",
     "//content/public/browser",
     "//content/test:test_support",
     "//device/bluetooth",
@@ -1136,6 +1150,7 @@ test("ash_content_unittests") {
     "//ui/views:test_support",
     "//ui/views/controls/webview:test_support",
     "//ui/web_dialogs:test_support",
+    "//ui/wm/public",
   ]
 
   data_deps = [
@@ -1157,19 +1172,33 @@ source_set("common_unittests") {
     "accelerators/spoken_feedback_toggler_unittest.cc",
     "ash_touch_exploration_manager_chromeos_unittest.cc",
     "autoclick/autoclick_unittest.cc",
-    "devtools/ash_devtools_unittest.cc",
     "display/display_configuration_controller_unittest.cc",
     "drag_drop/drag_image_view_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_size_button_unittest.cc",
     "frame/custom_frame_view_ash_unittest.cc",
     "frame/default_header_painter_unittest.cc",
+    "highlighter/highlighter_controller_unittest.cc",
+    "highlighter/highlighter_gesture_util_unittest.cc",
+    "ime/ime_controller_unittest.cc",
     "laser/laser_pointer_controller_unittest.cc",
-    "laser/laser_pointer_points_unittest.cc",
     "laser/laser_segment_utils_unittest.cc",
     "login/lock_screen_controller_unittest.cc",
+    "login/mock_lock_screen_client.cc",
+    "login/mock_lock_screen_client.h",
+    "login/ui/lock_contents_view_unittest.cc",
+    "login/ui/lock_screen_sanity_unittest.cc",
+    "login/ui/login_auth_user_view_unittest.cc",
+    "login/ui/login_password_view_test.cc",
+    "login/ui/login_pin_view_unittest.cc",
+    "login/ui/login_test_base.cc",
+    "login/ui/login_test_base.h",
+    "login/ui/login_test_utils.cc",
+    "login/ui/login_test_utils.h",
+    "login/ui/login_user_view_unittest.cc",
     "metrics/desktop_task_switch_metric_recorder_unittest.cc",
     "metrics/pointer_metrics_recorder_unittest.cc",
     "metrics/task_switch_metrics_recorder_unittest.cc",
@@ -1186,9 +1215,9 @@ source_set("common_unittests") {
     "shelf/shelf_application_menu_model_unittest.cc",
     "shelf/shelf_background_animator_unittest.cc",
     "shelf/shelf_button_pressed_metric_tracker_unittest.cc",
+    "shelf/shelf_controller_unittest.cc",
     "shelf/shelf_layout_manager_unittest.cc",
     "shelf/shelf_locking_manager_unittest.cc",
-    "shelf/shelf_model_unittest.cc",
     "shelf/shelf_tooltip_manager_unittest.cc",
     "shelf/shelf_unittest.cc",
     "shelf/shelf_view_unittest.cc",
@@ -1198,6 +1227,7 @@ source_set("common_unittests") {
     "sticky_keys/sticky_keys_overlay_unittest.cc",
     "sticky_keys/sticky_keys_unittest.cc",
     "system/audio/tray_audio_unittest.cc",
+    "system/bluetooth/bluetooth_power_controller_unittest.cc",
     "system/bluetooth/tray_bluetooth_helper_unittest.cc",
     "system/brightness/tray_brightness_unittest.cc",
     "system/date/date_view_unittest.cc",
@@ -1205,6 +1235,7 @@ source_set("common_unittests") {
     "system/enterprise/tray_enterprise_unittest.cc",
     "system/ime/tray_ime_chromeos_unittest.cc",
     "system/ime_menu/ime_menu_tray_unittest.cc",
+    "system/keyboard_brightness/tray_keyboard_brightness_unittest.cc",
     "system/lock_screen_action/lock_screen_action_tray_unittest.cc",
     "system/media_security/multi_profile_media_tray_item_unittest.cc",
     "system/network/network_icon_unittest.cc",
@@ -1212,11 +1243,13 @@ source_set("common_unittests") {
     "system/network/tray_network_unittest.cc",
     "system/network/vpn_list_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",
     "system/overview/overview_button_tray_unittest.cc",
     "system/palette/mock_palette_tool_delegate.cc",
     "system/palette/mock_palette_tool_delegate.h",
     "system/palette/palette_tool_manager_unittest.cc",
+    "system/palette/palette_tray_unittest.cc",
     "system/palette/tools/create_note_unittest.cc",
     "system/palette/tools/metalayer_unittest.cc",
     "system/palette/tools/screenshot_unittest.cc",
@@ -1236,7 +1269,10 @@ source_set("common_unittests") {
     "system/tray/size_range_layout_unittest.cc",
     "system/tray/system_tray_unittest.cc",
     "system/tray/tray_details_view_unittest.cc",
+    "system/tray/tray_event_filter_unittest.cc",
+    "system/tray/tray_info_label_unittest.cc",
     "system/tray/tri_view_unittest.cc",
+    "system/tray_tracing_unittest.cc",
     "system/update/tray_update_unittest.cc",
     "system/user/tray_user_unittest.cc",
     "system/web_notification/ash_popup_alignment_delegate_unittest.cc",
@@ -1250,8 +1286,6 @@ source_set("common_unittests") {
     "wm/container_finder_unittest.cc",
     "wm/immersive_fullscreen_controller_unittest.cc",
     "wm/lock_state_controller_unittest.cc",
-    "wm/maximize_mode/accelerometer_test_data_literals.cc",
-    "wm/maximize_mode/maximize_mode_window_manager_unittest.cc",
     "wm/mru_window_tracker_unittest.cc",
     "wm/overlay_event_filter_unittest.cc",
     "wm/overview/cleanup_animation_observer_unittest.cc",
@@ -1262,8 +1296,11 @@ source_set("common_unittests") {
     "wm/screen_dimmer_unittest.cc",
     "wm/screen_pinning_controller_unittest.cc",
     "wm/session_state_animator_impl_unittest.cc",
+    "wm/splitview/split_view_controller_unittest.cc",
     "wm/stacking_controller_unittest.cc",
     "wm/system_modal_container_layout_manager_unittest.cc",
+    "wm/tablet_mode/accelerometer_test_data_literals.cc",
+    "wm/tablet_mode/tablet_mode_window_manager_unittest.cc",
     "wm/toplevel_window_event_handler_unittest.cc",
     "wm/video_detector_unittest.cc",
     "wm/window_animations_unittest.cc",
@@ -1280,18 +1317,20 @@ source_set("common_unittests") {
     "wm/workspace_controller_unittest.cc",
   ]
   deps = [
+    ":test_support_without_content",
     "//ash",
     "//ash/mus:lib",
     "//ash/public/cpp:ash_public_cpp",
     "//ash/public/cpp:unit_tests",
     "//ash/resources/vector_icons",
-    "//ash/test:test_support_without_content",
     "//base",
     "//base/test:test_support",
     "//chromeos",
     "//chromeos:power_manager_proto",
+    "//chromeos:test_support",
     "//chromeos:test_support_without_gmock",
     "//components/prefs:test_support",
+    "//components/user_manager:test_support",
     "//device/bluetooth",
     "//services/ui/public/interfaces",
     "//testing/gmock",
@@ -1307,16 +1346,22 @@ source_set("common_unittests") {
     "//ui/events:test_support",
     "//ui/gfx:test_support",
     "//ui/keyboard",
+    "//ui/keyboard:test_support",
     "//ui/message_center",
     "//ui/message_center:test_support",
     "//ui/views",
     "//ui/views:test_support",
     "//ui/wm",
     "//ui/wm:test_support",
+    "//ui/wm/public",
   ]
   public_deps = [
-    "//ash/test:test_support_without_content",
+    ":test_support_without_content",
   ]
+
+  if (use_ozone) {
+    sources += [ "wm/tablet_mode/touchpad_and_keyboard_disabler_unittest.cc" ]
+  }
 }
 
 test("ash_unittests") {
@@ -1326,9 +1371,7 @@ test("ash_unittests") {
 
     # Specific to classic-ash.
     "app_list/app_list_presenter_delegate_unittest.cc",
-
-    # TODO: move to common_unittests when http://crbug.com/693790 is fixed.
-    "aura/pointer_watcher_adapter_unittest.cc",
+    "pointer_watcher_adapter_classic_unittest.cc",
 
     # TODO: decide if this needs to be ported. http://crbug.com/695566.
     "dip_unittest.cc",
@@ -1389,7 +1432,7 @@ test("ash_unittests") {
     "wm/always_on_top_controller_unittest.cc",
 
     # TODO: mash doesn't support CursorManager. http://crbug.com/631103.
-    "wm/ash_native_cursor_manager_unittest.cc",
+    "wm/native_cursor_manager_ash_unittest.cc",
 
     # TODO: mash doesn't support DragWindowResizer. http://crbug.com/633782.
     "wm/drag_window_resizer_unittest.cc",
@@ -1400,10 +1443,14 @@ test("ash_unittests") {
 
     # TODO: fails because keyboard is not enabled in mash.
     # http://crbug.com/648733.
+    "wm/lock_action_handler_layout_manager_unittest.cc",
+
+    # TODO: fails because keyboard is not enabled in mash.
+    # http://crbug.com/648733.
     "wm/lock_layout_manager_unittest.cc",
 
     # TODO: investigate failures in mash. http://crbug.com/698092.
-    "wm/maximize_mode/maximize_mode_controller_unittest.cc",
+    "wm/tablet_mode/tablet_mode_controller_unittest.cc",
 
     # TODO: mash doesn't support CursorManager. http://crbug.com/631103.
     "wm/resize_shadow_and_cursor_unittest.cc",
@@ -1428,20 +1475,22 @@ test("ash_unittests") {
   deps = [
     ":ash",
     ":common_unittests",
+    ":test_support_without_content",
     "//ash/autoclick/common:autoclick",
     "//ash/public/cpp:ash_public_cpp",
     "//ash/resources",
     "//ash/resources/vector_icons",
     "//ash/strings",
-    "//ash/test:test_support_without_content",
     "//ash/touch_hud",
     "//base",
     "//base/test:test_support",
+    "//cc:test_support",
     "//chromeos",
     "//chromeos:test_support_without_gmock",
     "//components/quirks",
     "//components/signin/core/account_id",
     "//components/user_manager",
+    "//components/viz/test:test_support",
     "//device/bluetooth",
     "//mojo/edk/system",
     "//net:net",
@@ -1473,12 +1522,14 @@ test("ash_unittests") {
     "//ui/gfx/geometry",
     "//ui/gl:test_support",
     "//ui/keyboard",
+    "//ui/keyboard:test_support",
     "//ui/message_center",
     "//ui/resources",
     "//ui/strings",
     "//ui/views",
     "//ui/views:test_support",
     "//ui/wm",
+    "//ui/wm/public",
     "//url",
   ]
 
@@ -1500,6 +1551,31 @@ test("ash_unittests") {
   ]
 }
 
+test("ash_perftests") {
+  sources = [
+    "perftests/ash_background_filter_blur_perftest.cc",
+    "test/ash_perftests.cc",
+    "test/ash_test_suite.cc",
+    "test/ash_test_suite.h",
+  ]
+
+  deps = [
+    ":test_support_without_content",
+    "//ash/public/cpp:ash_public_cpp",
+    "//base/test:test_support",
+    "//cc:test_support",
+    "//cc/base",
+    "//components/viz/test:test_support",
+    "//mojo/edk/embedder:headers",
+    "//testing/gtest",
+    "//testing/perf",
+    "//ui/aura",
+    "//ui/base",
+    "//ui/compositor:test_support",
+    "//ui/gl:test_support",
+  ]
+}
+
 executable("ash_shell_with_content") {
   testonly = true
   sources = [
@@ -1523,3 +1599,210 @@ executable("ash_shell_with_content") {
     "//ash/resources:ash_test_resources_200_percent",
   ]
 }
+
+static_library("test_support_without_content") {
+  testonly = true
+  sources = [
+    "test/ash_test_environment_default.cc",
+  ]
+
+  public_deps = [
+    ":test_support_common",
+  ]
+
+  deps = [
+    "//base",
+    "//base/test:test_support",
+    "//skia",
+  ]
+}
+
+static_library("test_support_with_content") {
+  testonly = true
+  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" ]
+
+  public_deps = [
+    ":test_support_common",
+    "//ash:ash_with_content",
+    "//content/public/browser",
+    "//content/test:test_support",
+    "//skia",
+  ]
+}
+
+# Internal target consumed by |test_support_with_content| and
+# |test_support_without_content|. This target contains all the test support
+# files, with the exception of an implementation of AshTestEnvironment.
+# Consumers of ash should use one of |test_support_with_content| or
+# |test_support_without_content|.
+static_library("test_support_common") {
+  testonly = true
+  visibility = [ ":*" ]
+  sources = [
+    "app_list/test_app_list_view_presenter_impl.cc",
+    "app_list/test_app_list_view_presenter_impl.h",
+    "display/display_configuration_controller_test_api.cc",
+    "display/display_configuration_controller_test_api.h",
+    "display/mirror_window_test_api.cc",
+    "display/mirror_window_test_api.h",
+    "display/screen_orientation_controller_test_api.cc",
+    "display/screen_orientation_controller_test_api.h",
+    "highlighter/highlighter_controller_test_api.cc",
+    "highlighter/highlighter_controller_test_api.h",
+    "keyboard/test_keyboard_ui.cc",
+    "keyboard/test_keyboard_ui.h",
+    "laser/laser_pointer_controller_test_api.cc",
+    "laser/laser_pointer_controller_test_api.h",
+    "metrics/task_switch_time_tracker_test_api.cc",
+    "metrics/task_switch_time_tracker_test_api.h",
+    "metrics/user_metrics_recorder_test_api.cc",
+    "metrics/user_metrics_recorder_test_api.h",
+
+    # TODO(jamescook): Consider adding a //ash/public/cpp:test_support target.
+    "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",
+    "rotator/screen_rotation_animator_test_api.h",
+    "session/test_session_controller_client.cc",
+    "session/test_session_controller_client.h",
+    "shelf/overflow_bubble_view_test_api.cc",
+    "shelf/overflow_bubble_view_test_api.h",
+    "shelf/overflow_button_test_api.cc",
+    "shelf/overflow_button_test_api.h",
+    "shelf/shelf_button_pressed_metric_tracker_test_api.cc",
+    "shelf/shelf_button_pressed_metric_tracker_test_api.h",
+    "shelf/shelf_view_test_api.cc",
+    "shelf/shelf_view_test_api.h",
+    "shell/toplevel_window.cc",
+    "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/test_palette_delegate.cc",
+    "system/palette/test_palette_delegate.h",
+    "system/status_area_widget_test_helper.cc",
+    "system/status_area_widget_test_helper.h",
+    "system/tray/system_tray_test_api.h",
+    "system/tray/test_system_tray_item.cc",
+    "system/tray/test_system_tray_item.h",
+    "test/ash_test_base.cc",
+    "test/ash_test_base.h",
+    "test/ash_test_environment.h",
+    "test/ash_test_helper.cc",
+    "test/ash_test_helper.h",
+    "test/ash_test_views_delegate.cc",
+    "test/ash_test_views_delegate.h",
+
+    # TODO(jamescook): Rename to TestChildModalWindow and move to //ash/wm
+    "test/child_modal_window.cc",
+    "test/child_modal_window.h",
+
+    # TODO(jamescook): Create //ash/accessibility for this and other code.
+    "test/test_accessibility_delegate.cc",
+    "test/test_accessibility_delegate.h",
+    "test/ui_controls_factory_ash.cc",
+    "test/ui_controls_factory_ash.h",
+    "test_screenshot_delegate.cc",
+    "test_screenshot_delegate.h",
+    "test_shell_delegate.cc",
+    "test_shell_delegate.h",
+    "wallpaper/test_wallpaper_delegate.cc",
+    "wallpaper/test_wallpaper_delegate.h",
+    "wallpaper/wallpaper_controller_test_api.cc",
+    "wallpaper/wallpaper_controller_test_api.h",
+    "wm/cursor_manager_test_api.cc",
+    "wm/cursor_manager_test_api.h",
+    "wm/lock_state_controller_test_api.cc",
+    "wm/lock_state_controller_test_api.h",
+    "wm/test_activation_delegate.cc",
+    "wm/test_activation_delegate.h",
+    "wm/test_overlay_delegate.cc",
+    "wm/test_overlay_delegate.h",
+    "wm/test_session_state_animator.cc",
+    "wm/test_session_state_animator.h",
+    "wm/workspace/workspace_event_handler_test_helper.cc",
+    "wm/workspace/workspace_event_handler_test_helper.h",
+    "wm/workspace_controller_test_api.cc",
+    "wm/workspace_controller_test_api.h",
+  ]
+  configs += [ "//build/config:precompiled_headers" ]
+
+  public_deps = [
+    "//ash",
+    "//testing/gtest",
+    "//third_party/WebKit/public:blink_headers",
+    "//ui/display:display_manager_test_api",
+  ]
+  deps = [
+    "//ash",
+    "//ash/mus:lib",
+    "//ash/public/cpp:ash_public_cpp",
+    "//ash/resources",
+    "//base",
+    "//base:i18n",
+    "//base/test:test_support",
+    "//chromeos",
+    "//components/prefs:test_support",
+    "//components/signin/core/account_id",
+    "//components/user_manager:user_manager",
+    "//device/bluetooth",
+    "//services/ui/public/cpp/input_devices",
+    "//services/ui/public/interfaces",
+    "//skia",
+    "//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",
+    "//ui/compositor:test_support",
+    "//ui/display",
+    "//ui/display/types",
+    "//ui/events:events_base",
+    "//ui/events:test_support",
+    "//ui/events/devices",
+    "//ui/gl",
+    "//ui/gl:test_support",
+    "//ui/keyboard",
+    "//ui/message_center",
+    "//ui/views",
+    "//ui/views:test_support",
+    "//ui/wm",
+    "//ui/wm/public",
+  ]
+
+  if (use_x11) {
+    deps += [ "//ui/gfx/x" ]
+  }
+}
+
+static_library("interactive_ui_test_support") {
+  testonly = true
+  configs += [ "//build/config:precompiled_headers" ]
+  public_deps = [
+    ":test_support_without_content",
+    "//ash",
+  ]
+  sources = [
+    "test/ash_interactive_ui_test_base.cc",
+    "test/ash_interactive_ui_test_base.h",
+  ]
+  deps = [
+    ":test_support_with_content",
+    "//base",
+    "//skia",
+    "//testing/gtest",
+    "//ui/aura",
+    "//ui/base",
+    "//ui/gl:test_support",
+  ]
+}