BASELINE: Update chromium to 44.0.2403.47

Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

3 files changed, 160 insertions, 127 deletions

diff --git a/chromium/ash/ash.gyp b/chromium/ash/ash.gyp
index 8a8c36edc4c..e8e819b02d1 100644
--- a/chromium/ash/ash.gyp
+++ b/chromium/ash/ash.gyp
@@ -5,15 +5,12 @@
 {
   'variables': {
     'chromium_code': 1,
-    'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
     # These files lists are shared with the GN build.
     'ash_sources': [
       'accelerators/accelerator_commands.cc',
       'accelerators/accelerator_commands.h',
       'accelerators/accelerator_controller.cc',
       'accelerators/accelerator_controller.h',
-      'accelerators/nested_accelerator_delegate.cc',
-      'accelerators/nested_accelerator_delegate.h',
       'accelerators/accelerator_delegate.cc',
       'accelerators/accelerator_delegate.h',
       'accelerators/accelerator_table.cc',
@@ -22,22 +19,17 @@
       'accelerators/debug_commands.h',
       'accelerators/exit_warning_handler.cc',
       'accelerators/exit_warning_handler.h',
-      'accelerators/key_hold_detector.cc',
-      'accelerators/key_hold_detector.h',
       'accelerators/focus_manager_factory.cc',
       'accelerators/focus_manager_factory.h',
+      'accelerators/key_hold_detector.cc',
+      'accelerators/key_hold_detector.h',
       'accelerators/magnifier_key_scroller.cc',
       'accelerators/magnifier_key_scroller.h',
+      'accelerators/nested_accelerator_delegate.cc',
+      'accelerators/nested_accelerator_delegate.h',
       'accelerators/spoken_feedback_toggler.cc',
       'accelerators/spoken_feedback_toggler.h',
-      'accelerometer/accelerometer_controller.cc',
-      'accelerometer/accelerometer_controller.h',
-      'accelerometer/accelerometer_observer.h',
       'accessibility_delegate.h',
-      'audio/sounds.cc',
-      'audio/sounds.h',
-      'autoclick/autoclick_controller.cc',
-      'autoclick/autoclick_controller.h',
       'ash_constants.cc',
       'ash_constants.h',
       'ash_export.h',
@@ -45,8 +37,16 @@
       'ash_switches.h',
       'ash_touch_exploration_manager_chromeos.cc',
       'ash_touch_exploration_manager_chromeos.h',
+      'audio/sounds.cc',
+      'audio/sounds.h',
+      'autoclick/autoclick_controller.cc',
+      'autoclick/autoclick_controller.h',
       'cancel_mode.cc',
       'cancel_mode.h',
+      'content/display/display_color_manager_chromeos.cc',
+      'content/display/display_color_manager_chromeos.h',
+      'content/display/screen_orientation_controller_chromeos.cc',
+      'content/display/screen_orientation_controller_chromeos.h',
       'debug.cc',
       'debug.h',
       'default_accessibility_delegate.cc',
@@ -61,9 +61,6 @@
       'desktop_background/desktop_background_widget_controller.cc',
       'desktop_background/desktop_background_widget_controller.h',
       'desktop_background/user_wallpaper_delegate.h',
-      'desktop_background/wallpaper_resizer.cc',
-      'desktop_background/wallpaper_resizer.h',
-      'desktop_background/wallpaper_resizer_observer.h',
       'display/cursor_window_controller.cc',
       'display/cursor_window_controller.h',
       'display/display_change_observer_chromeos.cc',
@@ -74,21 +71,28 @@
       'display/display_controller.h',
       'display/display_error_observer_chromeos.cc',
       'display/display_error_observer_chromeos.h',
-      'display/display_info.h',
       'display/display_info.cc',
-      'display/display_layout.h',
+      'display/display_info.h',
       'display/display_layout.cc',
-      'display/display_layout_store.h',
+      'display/display_layout.h',
       'display/display_layout_store.cc',
+      'display/display_layout_store.h',
       'display/display_manager.cc',
       'display/display_manager.h',
       'display/display_pref_util.h',
+      'display/display_util.cc',
+      'display/display_util.h',
+      'display/extended_mouse_warp_controller.cc',
+      'display/extended_mouse_warp_controller.h',
       'display/event_transformation_handler.cc',
       'display/event_transformation_handler.h',
       'display/mirror_window_controller.cc',
       'display/mirror_window_controller.h',
       'display/mouse_cursor_event_filter.cc',
       'display/mouse_cursor_event_filter.h',
+      'display/mouse_warp_controller.h',
+      'display/null_mouse_warp_controller.cc',
+      'display/null_mouse_warp_controller.h',
       'display/projecting_observer_chromeos.cc',
       'display/projecting_observer_chromeos.h',
       'display/resolution_notification_controller.cc',
@@ -101,6 +105,8 @@
       'display/screen_position_controller.h',
       'display/shared_display_edge_indicator.cc',
       'display/shared_display_edge_indicator.h',
+      'display/unified_mouse_warp_controller.cc',
+      'display/unified_mouse_warp_controller.h',
       'drag_drop/drag_drop_controller.cc',
       'drag_drop/drag_drop_controller.h',
       'drag_drop/drag_drop_tracker.cc',
@@ -125,10 +131,10 @@
       'frame/caption_buttons/frame_size_button_delegate.h',
       'frame/custom_frame_view_ash.cc',
       'frame/custom_frame_view_ash.h',
-      'frame/frame_border_hit_test_controller.cc',
-      'frame/frame_border_hit_test_controller.h',
       'frame/default_header_painter.cc',
       'frame/default_header_painter.h',
+      'frame/frame_border_hit_test_controller.cc',
+      'frame/frame_border_hit_test_controller.h',
       'frame/frame_util.cc',
       'frame/frame_util.h',
       'frame/header_painter.h',
@@ -141,46 +147,47 @@
       'high_contrast/high_contrast_controller.h',
       'host/ash_remote_window_tree_host_win.cc',
       'host/ash_remote_window_tree_host_win.h',
+      'host/ash_window_tree_host.cc',
       'host/ash_window_tree_host.h',
       'host/ash_window_tree_host_init_params.cc',
       'host/ash_window_tree_host_init_params.h',
       'host/ash_window_tree_host_ozone.cc',
+      'host/ash_window_tree_host_unified.cc',
+      'host/ash_window_tree_host_unified.h',
       'host/ash_window_tree_host_win.cc',
       'host/ash_window_tree_host_x11.cc',
       'host/ash_window_tree_host_x11.h',
       'host/root_window_transformer.h',
       'host/transformer_helper.cc',
       'host/transformer_helper.h',
-      'ime/candidate_view.cc',
-      'ime/candidate_view.h',
-      'ime/candidate_window_view.cc',
-      'ime/candidate_window_view.h',
-      'ime/infolist_window.cc',
-      'ime/infolist_window.h',
-      'ime/input_method_menu_item.cc',
-      'ime/input_method_menu_item.h',
-      'ime/input_method_menu_manager.cc',
-      'ime/input_method_menu_manager.h',
-      'ime/mode_indicator_view.cc',
-      'ime/mode_indicator_view.h',
       'keyboard_uma_event_filter.cc',
       'keyboard_uma_event_filter.h',
       'magnifier/magnification_controller.cc',
       'magnifier/magnification_controller.h',
       'magnifier/partial_magnification_controller.cc',
       'magnifier/partial_magnification_controller.h',
+      'metrics/task_switch_metrics_recorder.cc',
+      'metrics/task_switch_metrics_recorder.h',
+      'metrics/task_switch_time_tracker.cc',
+      'metrics/task_switch_time_tracker.h',
       'metrics/user_metrics_recorder.cc',
       'metrics/user_metrics_recorder.h',
       'multi_profile_uma.cc',
       'multi_profile_uma.h',
+      'networking_config_delegate.cc',
+      'networking_config_delegate.h',
       'popup_message.cc',
       'popup_message.h',
       'root_window_controller.cc',
       'root_window_controller.h',
       'root_window_settings.cc',
       'root_window_settings.h',
-      'rotator/screen_rotation.cc',
-      'rotator/screen_rotation.h',
+      'rotator/screen_rotation_animation.cc',
+      'rotator/screen_rotation_animation.h',
+      'rotator/screen_rotation_animator.cc',
+      'rotator/screen_rotation_animator.h',
+      'rotator/window_rotation.cc',
+      'rotator/window_rotation.h',
       'scoped_target_root_window.cc',
       'scoped_target_root_window.h',
       'screen_util.cc',
@@ -252,11 +259,11 @@
       'shell_window_ids.h',
       'snap_to_pixel_layout_manager.cc',
       'snap_to_pixel_layout_manager.h',
-      'sticky_keys/sticky_keys_state.h',
       'sticky_keys/sticky_keys_controller.cc',
       'sticky_keys/sticky_keys_controller.h',
       'sticky_keys/sticky_keys_overlay.cc',
       'sticky_keys/sticky_keys_overlay.h',
+      'sticky_keys/sticky_keys_state.h',
       'switchable_windows.cc',
       'switchable_windows.h',
       'system/audio/audio_observer.h',
@@ -303,6 +310,12 @@
       'system/chromeos/network/tray_sms.h',
       'system/chromeos/network/tray_vpn.cc',
       'system/chromeos/network/tray_vpn.h',
+      'system/chromeos/network/vpn_delegate.cc',
+      'system/chromeos/network/vpn_delegate.h',
+      'system/chromeos/network/vpn_list_view.cc',
+      'system/chromeos/network/vpn_list_view.h',
+      'system/chromeos/power/battery_notification.cc',
+      'system/chromeos/power/battery_notification.h',
       'system/chromeos/power/power_event_observer.cc',
       'system/chromeos/power/power_event_observer.h',
       'system/chromeos/power/power_status.cc',
@@ -323,9 +336,9 @@
       'system/chromeos/screen_security/screen_share_tray_item.h',
       'system/chromeos/screen_security/screen_tray_item.cc',
       'system/chromeos/screen_security/screen_tray_item.h',
-      'system/chromeos/session/last_window_closed_observer.h',
       'system/chromeos/session/last_window_closed_logout_reminder.cc',
       'system/chromeos/session/last_window_closed_logout_reminder.h',
+      'system/chromeos/session/last_window_closed_observer.h',
       'system/chromeos/session/logout_button_observer.h',
       'system/chromeos/session/logout_button_tray.cc',
       'system/chromeos/session/logout_button_tray.h',
@@ -349,12 +362,9 @@
       'system/chromeos/tray_display.h',
       'system/chromeos/tray_tracing.cc',
       'system/chromeos/tray_tracing.h',
-      'system/chromeos/virtual_keyboard/tray_keyboard_lock.cc',
-      'system/chromeos/virtual_keyboard/tray_keyboard_lock.h',
-      'system/chromeos/virtual_keyboard/tray_keyboard_lock_unittest.h',
+      'system/chromeos/virtual_keyboard/virtual_keyboard_observer.h',
       'system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc',
       'system/chromeos/virtual_keyboard/virtual_keyboard_tray.h',
-      'system/chromeos/virtual_keyboard/virtual_keyboard_observer.h',
       'system/date/clock_observer.h',
       'system/date/date_default_view.cc',
       'system/date/date_default_view.h',
@@ -363,13 +373,13 @@
       'system/date/tray_date.cc',
       'system/date/tray_date.h',
       'system/ime/ime_observer.h',
-      'system/ime/tray_ime.cc',
-      'system/ime/tray_ime.h',
+      'system/ime/tray_ime_chromeos.cc',
+      'system/ime/tray_ime_chromeos.h',
       'system/keyboard_brightness/keyboard_brightness_control_delegate.h',
       'system/locale/locale_notification_controller.cc',
       'system/locale/locale_notification_controller.h',
-      'system/overview/overview_button_tray.h',
       'system/overview/overview_button_tray.cc',
+      'system/overview/overview_button_tray.h',
       'system/status_area_widget.cc',
       'system/status_area_widget.h',
       'system/status_area_widget_delegate.cc',
@@ -442,10 +452,10 @@
       'system/tray_update.h',
       'system/user/accounts_detailed_view.cc',
       'system/user/accounts_detailed_view.h',
-      'system/user/config.cc',
-      'system/user/config.h',
       'system/user/button_from_view.cc',
       'system/user/button_from_view.h',
+      'system/user/config.cc',
+      'system/user/config.h',
       'system/user/login_status.cc',
       'system/user/login_status.h',
       'system/user/rounded_image_view.cc',
@@ -455,11 +465,11 @@
       'system/user/tray_user_separator.cc',
       'system/user/tray_user_separator.h',
       'system/user/update_observer.h',
-      'system/user/user_observer.h',
       'system/user/user_accounts_delegate.cc',
       'system/user/user_accounts_delegate.h',
       'system/user/user_card_view.cc',
       'system/user/user_card_view.h',
+      'system/user/user_observer.h',
       'system/user/user_view.cc',
       'system/user/user_view.h',
       'system/web_notification/ash_popup_alignment_delegate.cc',
@@ -482,23 +492,25 @@
       'touch/touch_uma.h',
       'touch/touchscreen_util.cc',
       'touch/touchscreen_util.h',
+      'utility/partial_screenshot_controller.cc',
+      'utility/partial_screenshot_controller.h',
       'virtual_keyboard_controller.cc',
       'virtual_keyboard_controller.h',
       'volume_control_delegate.h',
-      'wm/app_list_controller.cc',
-      'wm/app_list_controller.h',
       'wm/always_on_top_controller.cc',
       'wm/always_on_top_controller.h',
-      'wm/ash_native_cursor_manager.cc',
-      'wm/ash_native_cursor_manager.h',
+      'wm/app_list_controller.cc',
+      'wm/app_list_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/cursor_manager_chromeos.cc',
-      'wm/cursor_manager_chromeos.h',
       'wm/coordinate_conversion.cc',
       'wm/coordinate_conversion.h',
+      'wm/cursor_manager_chromeos.cc',
+      'wm/cursor_manager_chromeos.h',
       'wm/default_state.cc',
       'wm/default_state.h',
       'wm/default_window_resizer.cc',
@@ -522,8 +534,6 @@
       'wm/gestures/overview_gesture_handler.h',
       'wm/gestures/shelf_gesture_handler.cc',
       'wm/gestures/shelf_gesture_handler.h',
-      'wm/gestures/tray_gesture_handler.cc',
-      'wm/gestures/tray_gesture_handler.h',
       'wm/immersive_fullscreen_controller.cc',
       'wm/immersive_fullscreen_controller.h',
       'wm/immersive_revealed_lock.cc',
@@ -542,6 +552,8 @@
       '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/maximize_mode/workspace_backdrop_delegate.cc',
@@ -550,29 +562,19 @@
       'wm/mru_window_tracker.h',
       'wm/overlay_event_filter.cc',
       'wm/overlay_event_filter.h',
+      'wm/overview/overview_animation_type.h',
+      'wm/overview/scoped_overview_animation_settings.cc',
+      'wm/overview/scoped_overview_animation_settings.h',
       'wm/overview/scoped_transform_overview_window.cc',
       'wm/overview/scoped_transform_overview_window.h',
-      'wm/overview/scoped_window_copy.cc',
-      'wm/overview/scoped_window_copy.h',
       'wm/overview/window_grid.cc',
       'wm/overview/window_grid.h',
       'wm/overview/window_selector.cc',
       'wm/overview/window_selector.h',
-      'wm/window_cycle_controller.cc',
-      'wm/window_cycle_controller.h',
-      'wm/window_cycle_list.cc',
-      'wm/window_cycle_list.h',
-      'wm/overview/transparent_activate_window_button.cc',
-      'wm/overview/transparent_activate_window_button.h',
       'wm/overview/window_selector_controller.cc',
       'wm/overview/window_selector_controller.h',
-      'wm/overview/window_selector_delegate.h',
       'wm/overview/window_selector_item.cc',
       'wm/overview/window_selector_item.h',
-      'wm/overview/window_selector_panels.cc',
-      'wm/overview/window_selector_panels.h',
-      'wm/overview/window_selector_window.cc',
-      'wm/overview/window_selector_window.h',
       'wm/panels/attached_panel_window_targeter.cc',
       'wm/panels/attached_panel_window_targeter.h',
       'wm/panels/panel_frame_view.cc',
@@ -583,8 +585,6 @@
       'wm/panels/panel_window_event_handler.h',
       'wm/panels/panel_window_resizer.cc',
       'wm/panels/panel_window_resizer.h',
-      'wm/partial_screenshot_view.cc',
-      'wm/partial_screenshot_view.h',
       'wm/power_button_controller.cc',
       'wm/power_button_controller.h',
       'wm/resize_handle_window_targeter.cc',
@@ -618,12 +618,18 @@
       'wm/toplevel_window_event_handler.h',
       'wm/video_detector.cc',
       'wm/video_detector.h',
-      "wm/virtual_keyboard_container_layout_manager.cc",
-      "wm/virtual_keyboard_container_layout_manager.h",
       'wm/window_animations.cc',
       'wm/window_animations.h',
+      'wm/window_cycle_controller.cc',
+      'wm/window_cycle_controller.h',
+      'wm/window_cycle_list.cc',
+      'wm/window_cycle_list.h',
       'wm/window_positioner.cc',
       'wm/window_positioner.h',
+      'wm/window_properties.cc',
+      'wm/window_properties.h',
+      'wm/window_resizer.cc',
+      'wm/window_resizer.h',
       'wm/window_state.cc',
       'wm/window_state.h',
       'wm/window_state_delegate.cc',
@@ -631,18 +637,12 @@
       'wm/window_state_observer.h',
       'wm/window_state_util.cc',
       'wm/window_state_util.h',
-      'wm/window_properties.cc',
-      'wm/window_properties.h',
-      'wm/window_resizer.cc',
-      'wm/window_resizer.h',
       'wm/window_util.cc',
       'wm/window_util.h',
       'wm/wm_event.cc',
       'wm/wm_event.h',
       'wm/wm_types.cc',
       'wm/wm_types.h',
-      'wm/workspace_controller.cc',
-      'wm/workspace_controller.h',
       'wm/workspace/magnetism_matcher.cc',
       'wm/workspace/magnetism_matcher.h',
       'wm/workspace/multi_window_resize_controller.cc',
@@ -659,6 +659,8 @@
       'wm/workspace/workspace_types.h',
       'wm/workspace/workspace_window_resizer.cc',
       'wm/workspace/workspace_window_resizer.h',
+      'wm/workspace_controller.cc',
+      'wm/workspace_controller.h',
     ],
     'ash_test_support_sources': [
       'desktop_background/desktop_background_controller_test_api.cc',
@@ -695,6 +697,8 @@
       'test/shell_test_api.h',
       'test/status_area_widget_test_helper.cc',
       'test/status_area_widget_test_helper.h',
+      'test/task_switch_time_tracker_test_api.cc',
+      'test/task_switch_time_tracker_test_api.h',
       'test/test_activation_delegate.cc',
       'test/test_activation_delegate.h',
       'test/test_lock_state_controller_delegate.cc',
@@ -725,6 +729,8 @@
       'test/test_volume_control_delegate.h',
       'test/ui_controls_factory_ash.cc',
       'test/ui_controls_factory_ash.h',
+      'test/user_metrics_recorder_test_api.cc',
+      'test/user_metrics_recorder_test_api.h',
       'test/virtual_keyboard_test_helper.cc',
       'test/virtual_keyboard_test_helper.h',
     ],
@@ -771,20 +777,24 @@
       'accelerators/spoken_feedback_toggler_unittest.cc',
       'ash_touch_exploration_manager_chromeos_unittest.cc',
       'autoclick/autoclick_unittest.cc',
+      'content/display/screen_orientation_controller_chromeos_unittest.cc',
       'desktop_background/desktop_background_controller_unittest.cc',
-      'desktop_background/wallpaper_resizer_unittest.cc',
       'dip_unittest.cc',
+      'display/cursor_window_controller_unittest.cc',
       'display/display_change_observer_chromeos_unittest.cc',
       'display/display_controller_unittest.cc',
       'display/display_error_observer_chromeos_unittest.cc',
       'display/display_info_unittest.cc',
       'display/display_manager_unittest.cc',
+      'display/display_util_unittest.cc',
+      'display/extended_mouse_warp_controller_unittest.cc',
       'display/mirror_window_controller_unittest.cc',
       'display/mouse_cursor_event_filter_unittest.cc',
       'display/projecting_observer_chromeos_unittest.cc',
       'display/resolution_notification_controller_unittest.cc',
       'display/root_window_transformers_unittest.cc',
       'display/screen_position_controller_unittest.cc',
+      'display/unified_mouse_warp_controller_unittest.cc',
       'drag_drop/drag_drop_controller_unittest.cc',
       'drag_drop/drag_drop_tracker_unittest.cc',
       'extended_desktop_unittest.cc',
@@ -794,16 +804,15 @@
       'frame/custom_frame_view_ash_unittest.cc',
       'frame/default_header_painter_unittest.cc',
       'host/ash_window_tree_host_x11_unittest.cc',
-      'ime/candidate_view_unittest.cc',
-      'ime/candidate_window_view_unittest.cc',
-      'ime/input_method_menu_item_unittest.cc',
-      'ime/input_method_menu_manager_unittest.cc',
       'keyboard_overlay/keyboard_overlay_delegate_unittest.cc',
       'keyboard_overlay/keyboard_overlay_view_unittest.cc',
       'magnifier/magnification_controller_unittest.cc',
+      'metrics/task_switch_metrics_recorder_unittest.cc',
+      'metrics/task_switch_time_tracker_unittest.cc',
+      'metrics/user_metrics_recorder_unittest.cc',
+      'popup_message_unittest.cc',
       'root_window_controller_unittest.cc',
       'screen_util_unittest.cc',
-      'screensaver/screensaver_view_unittest.cc',
       'shelf/scoped_observer_with_duplicated_sources_unittest.cc',
       'shelf/shelf_layout_manager_unittest.cc',
       'shelf/shelf_model_unittest.cc',
@@ -817,19 +826,19 @@
       'sticky_keys/sticky_keys_overlay_unittest.cc',
       'sticky_keys/sticky_keys_unittest.cc',
       'system/chromeos/brightness/tray_brightness_unittest.cc',
+      'system/chromeos/multi_user/user_switch_util_unittest.cc',
       'system/chromeos/power/power_event_observer_unittest.cc',
       'system/chromeos/power/power_status_unittest.cc',
       'system/chromeos/power/power_status_view_unittest.cc',
       'system/chromeos/power/tray_power_unittest.cc',
       'system/chromeos/rotation/tray_rotation_lock_unittest.cc',
-      'system/chromeos/multi_user/user_switch_util_unittest.cc',
       'system/chromeos/screen_security/screen_tray_item_unittest.cc',
       'system/chromeos/session/logout_confirmation_controller_unittest.cc',
       'system/chromeos/session/tray_session_length_limit_unittest.cc',
       'system/chromeos/supervised/tray_supervised_user_unittest.cc',
       'system/chromeos/tray_display_unittest.cc',
-      'system/chromeos/virtual_keyboard/tray_keyboard_lock_unittest.cc',
       'system/date/date_view_unittest.cc',
+      'system/ime/tray_ime_chromeos_unittest.cc',
       'system/overview/overview_button_tray_unittest.cc',
       'system/tray/media_security/multi_profile_media_tray_item_unittest.cc',
       'system/tray/system_tray_unittest.cc',
@@ -843,9 +852,12 @@
       'touch/touch_observer_hud_unittest.cc',
       'touch/touch_transformer_controller_unittest.cc',
       'touch/touchscreen_util_unittest.cc',
+      'utility/partial_screenshot_controller_unittest.cc',
       'virtual_keyboard_controller_unittest.cc',
+      'wm/always_on_top_controller_unittest.cc',
       'wm/app_list_controller_unittest.cc',
       'wm/ash_native_cursor_manager_unittest.cc',
+      'wm/ash_focus_rules_unittest.cc',
       'wm/dock/docked_window_layout_manager_unittest.cc',
       'wm/dock/docked_window_resizer_unittest.cc',
       'wm/drag_window_resizer_unittest.cc',
@@ -857,10 +869,10 @@
       'wm/maximize_mode/maximize_mode_controller_unittest.cc',
       'wm/maximize_mode/maximize_mode_window_manager_unittest.cc',
       'wm/mru_window_tracker_unittest.cc',
+      'wm/overlay_event_filter_unittest.cc',
       'wm/overview/window_selector_unittest.cc',
       'wm/panels/panel_layout_manager_unittest.cc',
       'wm/panels/panel_window_resizer_unittest.cc',
-      'wm/partial_screenshot_view_unittest.cc',
       'wm/resize_shadow_and_cursor_unittest.cc',
       'wm/screen_dimmer_unittest.cc',
       'wm/stacking_controller_unittest.cc',
@@ -875,7 +887,6 @@
       'wm/window_positioner_unittest.cc',
       'wm/window_state_unittest.cc',
       'wm/window_util_unittest.cc',
-      'wm/overlay_event_filter_unittest.cc',
       'wm/workspace/magnetism_matcher_unittest.cc',
       'wm/workspace/multi_window_resize_controller_unittest.cc',
       'wm/workspace/workspace_event_handler_test_helper.cc',
@@ -898,23 +909,26 @@
         '../base/base.gyp:base_i18n',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../cc/cc.gyp:cc',
+        '../components/components.gyp:device_event_log_component',
         '../components/components.gyp:user_manager',
+        '../components/components.gyp:wallpaper',
         '../content/content.gyp:content_browser',
         '../media/media.gyp:media',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
-        '../ui/accelerometer/ui_accelerometer.gyp:ui_accelerometer',
         '../ui/accessibility/accessibility.gyp:accessibility',
         '../ui/app_list/app_list.gyp:app_list',
         '../ui/aura/aura.gyp:aura',
+        '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
         '../ui/base/ui_base.gyp:ui_base',
         '../ui/compositor/compositor.gyp:compositor',
         '../ui/events/devices/events_devices.gyp:events_devices',
         '../ui/events/events.gyp:events',
         '../ui/events/events.gyp:events_base',
         '../ui/events/events.gyp:gesture_detection',
+        '../ui/events/platform/events_platform.gyp:events_platform',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/keyboard/keyboard.gyp:keyboard',
@@ -945,27 +959,26 @@
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
         }],
-        ['use_x11!=1', {
-          'sources!': [
-            # Note: sources list duplicated in GN build.
-            'accelerators/key_hold_detector.cc',
-            'accelerators/key_hold_detector.h',
-            'accelerators/magnifier_key_scroller.cc',
-            'accelerators/magnifier_key_scroller.h',
-            'accelerators/spoken_feedback_toggler.cc',
-            'accelerators/spoken_feedback_toggler.h',
-          ],
-        }, { # else: use_x11==1
+        ['use_x11==1', {
           'dependencies': [
+            '../build/linux/system.gyp:x11',
             '../build/linux/system.gyp:xfixes',
+            '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
            ],
         }],
+        ['use_ozone==1', {
+          'dependencies': [
+            '../ui/events/ozone/events_ozone.gyp:events_ozone',
+            '../ui/ozone/ozone.gyp:ozone',
+          ],
+        }],
         ['chromeos==1', {
           'dependencies': [
             '../chromeos/chromeos.gyp:chromeos',
             # Ash #includes power_supply_properties.pb.h directly.
             '../chromeos/chromeos.gyp:power_manager_proto',
             '../device/bluetooth/bluetooth.gyp:device_bluetooth',
+            '../third_party/qcms/qcms.gyp:qcms',
             '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
             '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',
             '../ui/chromeos/ui_chromeos.gyp:ui_chromeos',
@@ -974,6 +987,12 @@
           ],
         }, { # else: chromeos!=1
           'sources!': [
+            'accelerators/key_hold_detector.cc',
+            'accelerators/key_hold_detector.h',
+            'accelerators/magnifier_key_scroller.cc',
+            'accelerators/magnifier_key_scroller.h',
+            'accelerators/spoken_feedback_toggler.cc',
+            'accelerators/spoken_feedback_toggler.h',
             'display/display_configurator_animation.cc',
             'display/display_configurator_animation.h',
             'display/resolution_notification_controller.cc',
@@ -1025,8 +1044,6 @@
         'content_support/ash_with_content_export.h',
         'content_support/gpu_support_impl.cc',
         'content_support/gpu_support_impl.h',
-        'screensaver/screensaver_view.cc',
-        'screensaver/screensaver_view.h',
         'keyboard_overlay/keyboard_overlay_delegate.cc',
         'keyboard_overlay/keyboard_overlay_delegate.h',
         'keyboard_overlay/keyboard_overlay_view.cc',
@@ -1082,11 +1099,11 @@
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
-        '../ui/accelerometer/ui_accelerometer.gyp:ui_accelerometer',
         '../ui/accessibility/accessibility.gyp:accessibility',
         '../ui/app_list/app_list.gyp:app_list',
         '../ui/aura/aura.gyp:aura',
         '../ui/aura/aura.gyp:aura_test_support',
+        '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
         '../ui/base/ui_base.gyp:ui_base',
         '../ui/base/ui_base.gyp:ui_base_test_support',
         '../ui/compositor/compositor.gyp:compositor',
@@ -1121,16 +1138,20 @@
           'sources!': [
             # TODO(zork): fix this test to build on Windows. See: crosbug.com/26906
             'focus_cycler_unittest.cc',
+
             # All tests for multiple displays: not supported on Windows Ash.
             'wm/drag_window_resizer_unittest.cc',
+
             # Can't resize on Windows Ash. http://crbug.com/165962
+            'autoclick/autoclick_unittest.cc',
             'magnifier/magnification_controller_unittest.cc',
-            'wm/workspace/workspace_window_resizer_unittest.cc',
             'sticky_keys/sticky_keys_overlay_unittest.cc',
             'sticky_keys/sticky_keys_unittest.cc',
+            'system/chromeos/rotation/tray_rotation_lock_unittest.cc',
             'system/tray/media_security/multi_profile_media_tray_item_unittest.cc',
-            'autoclick/autoclick_unittest.cc',
-            "virtual_keyboard_controller_unittest.cc"
+            'virtual_keyboard_controller_unittest.cc',
+            'wm/maximize_mode/maximize_mode_controller_unittest.cc',
+            'wm/workspace/workspace_window_resizer_unittest.cc',
           ],
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
@@ -1143,12 +1164,6 @@
             '../base/allocator/allocator.gyp:allocator',
           ],
         }],
-        ['use_x11!=1', {
-          'sources!': [
-            'accelerators/magnifier_key_scroller_unittest.cc',
-            'accelerators/spoken_feedback_toggler_unittest.cc',
-          ],
-        }],
         ['chromeos==1', {
           'dependencies': [
             '../chromeos/chromeos.gyp:chromeos_test_support_without_gmock',
@@ -1163,6 +1178,8 @@
           ],
         }, { # else: chromeos!=1
           'sources!': [
+            'accelerators/magnifier_key_scroller_unittest.cc',
+            'accelerators/spoken_feedback_toggler_unittest.cc',
             'display/resolution_notification_controller_unittest.cc',
             'touch/touch_transformer_controller_unittest.cc',
             'touch/touchscreen_util_unittest.cc',
@@ -1198,6 +1215,7 @@
         '../third_party/icu/icu.gyp:icuuc',
         '../ui/app_list/app_list.gyp:app_list',
         '../ui/aura/aura.gyp:aura',
+        '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
         '../ui/base/ui_base.gyp:ui_base',
         '../ui/compositor/compositor.gyp:compositor',
         '../ui/events/events.gyp:events',
@@ -1309,6 +1327,15 @@
           'sources': [
             'ash_unittests.isolate',
           ],
+          'conditions': [
+            ['use_x11==1',
+              {
+                'dependencies': [
+                  '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+                ],
+              }
+            ],
+          ],
         },
       ],
     }],
diff --git a/chromium/ash/ash_resources.gyp b/chromium/ash/ash_resources.gyp
index 930cde8d0c0..d84fea406f0 100644
--- a/chromium/ash/ash_resources.gyp
+++ b/chromium/ash/ash_resources.gyp
@@ -5,6 +5,7 @@
 {
   'targets': [
     {
+      # GN version: //ash/resources
       'target_name': 'ash_resources',
       'type': 'none',
       'variables': {
diff --git a/chromium/ash/ash_unittests.isolate b/chromium/ash/ash_unittests.isolate
index 918a8e02529..40e3e793c68 100644
--- a/chromium/ash/ash_unittests.isolate
+++ b/chromium/ash/ash_unittests.isolate
@@ -3,19 +3,16 @@
 # found in the LICENSE file.
 {
   'conditions': [
-    ['OS=="win" or chromeos==1', {
+    ['use_x11==0', {
       'variables': {
-        'files': [
+        'command': [
           '../testing/test_env.py',
           '<(PRODUCT_DIR)/ash_unittests<(EXECUTABLE_SUFFIX)',
-          '<(PRODUCT_DIR)/chrome_100_percent.pak',
-          '<(PRODUCT_DIR)/chrome_200_percent.pak',
-          '<(PRODUCT_DIR)/locales/en-US.pak',
-          '<(PRODUCT_DIR)/keyboard_resources.pak',
+          '--test-launcher-bot-mode',
         ],
       },
     }],
-    ['OS=="linux"', {
+    ['use_x11==1', {
       'variables': {
         'command': [
           '../testing/xvfb.py',
@@ -25,25 +22,32 @@
         ],
         'files': [
           '../testing/xvfb.py',
-          '<(PRODUCT_DIR)/libffmpegsumo.so',
-          '<(PRODUCT_DIR)/libosmesa.so',
+          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
-    ['OS=="linux" and use_ozone==0', {
+    ['OS=="win" or chromeos==1', {
       'variables': {
         'files': [
-          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
+          '../testing/test_env.py',
+          '<(PRODUCT_DIR)/ash_unittests<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/chrome_100_percent.pak',
+          '<(PRODUCT_DIR)/chrome_200_percent.pak',
+          '<(PRODUCT_DIR)/locales/en-US.pak',
+          '<(PRODUCT_DIR)/keyboard_resources.pak',
         ],
       },
     }],
-    ['OS=="win"', {
+    ['OS=="linux"', {
       'variables': {
-        'command': [
-          '../testing/test_env.py',
-          '<(PRODUCT_DIR)/ash_unittests.exe',
-          '--test-launcher-bot-mode',
+        'files': [
+          '<(PRODUCT_DIR)/libffmpegsumo.so',
+          '<(PRODUCT_DIR)/libosmesa.so',
         ],
+      },
+    }],
+    ['OS=="win"', {
+      'variables': {
         'files': [
           '<(PRODUCT_DIR)/ffmpegsumo.dll',
           '<(PRODUCT_DIR)/osmesa.dll',
@@ -60,5 +64,6 @@
   ],
   'includes': [
     '../base/base.isolate',
+    '../third_party/angle/angle.isolate',
   ],
 }