BASELINE: Update Chromium to 49.0.2623.23

Also adds missing printing sources.

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

2 files changed, 67 insertions, 41 deletions

diff --git a/chromium/ash/ash.gyp b/chromium/ash/ash.gyp
index 0b5c98a2d86..f87be98e0f1 100644
--- a/chromium/ash/ash.gyp
+++ b/chromium/ash/ash.gyp
@@ -33,6 +33,8 @@
       'ash_constants.cc',
       'ash_constants.h',
       'ash_export.h',
+      'ash_layout_constants.cc',
+      'ash_layout_constants.h',
       'ash_switches.cc',
       'ash_switches.h',
       'ash_touch_exploration_manager_chromeos.cc',
@@ -45,10 +47,6 @@
       'cancel_mode.h',
       'cast_config_delegate.cc',
       'cast_config_delegate.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',
@@ -65,10 +63,12 @@
       'desktop_background/user_wallpaper_delegate.h',
       'display/cursor_window_controller.cc',
       'display/cursor_window_controller.h',
+      'display/display_animator.cc',
+      'display/display_animator.h',
       'display/display_change_observer_chromeos.cc',
       'display/display_change_observer_chromeos.h',
-      'display/display_configurator_animation.cc',
-      'display/display_configurator_animation.h',
+      'display/display_color_manager_chromeos.cc',
+      'display/display_color_manager_chromeos.h',
       'display/window_tree_host_manager.cc',
       'display/window_tree_host_manager.h',
       'display/display_error_observer_chromeos.cc',
@@ -103,6 +103,8 @@
       '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_position_controller.cc',
       'display/screen_position_controller.h',
       'display/shared_display_edge_indicator.cc',
@@ -137,8 +139,6 @@
       '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',
       'frame/header_painter_util.cc',
       'frame/header_painter_util.h',
@@ -328,6 +328,8 @@
       'system/chromeos/network/vpn_list_view.h',
       'system/chromeos/power/battery_notification.cc',
       'system/chromeos/power/battery_notification.h',
+      'system/chromeos/power/dual_role_notification.cc',
+      'system/chromeos/power/dual_role_notification.h',
       'system/chromeos/power/power_event_observer.cc',
       'system/chromeos/power/power_event_observer.h',
       'system/chromeos/power/power_status.cc',
@@ -462,12 +464,8 @@
       'system/tray_accessibility.h',
       'system/tray_update.cc',
       'system/tray_update.h',
-      'system/user/accounts_detailed_view.cc',
-      'system/user/accounts_detailed_view.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',
@@ -477,8 +475,6 @@
       'system/user/tray_user_separator.cc',
       'system/user/tray_user_separator.h',
       'system/user/update_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',
@@ -527,6 +523,8 @@
       'wm/default_state.h',
       'wm/default_window_resizer.cc',
       'wm/default_window_resizer.h',
+      'wm/dim_window.cc',
+      'wm/dim_window.h',
       'wm/dock/docked_window_layout_manager.cc',
       'wm/dock/docked_window_layout_manager.h',
       'wm/dock/docked_window_layout_manager_observer.h',
@@ -678,16 +676,18 @@
       'content/ash_with_content_export.h',
       'content/gpu_support_impl.cc',
       'content/gpu_support_impl.h',
-      'keyboard_overlay/keyboard_overlay_delegate.cc',
-      'keyboard_overlay/keyboard_overlay_delegate.h',
-      'keyboard_overlay/keyboard_overlay_view.cc',
-      'keyboard_overlay/keyboard_overlay_view.h',
+      'content/keyboard_overlay/keyboard_overlay_delegate.cc',
+      'content/keyboard_overlay/keyboard_overlay_delegate.h',
+      'content/keyboard_overlay/keyboard_overlay_view.cc',
+      'content/keyboard_overlay/keyboard_overlay_view.h',
+      'content/screen_orientation_delegate_chromeos.cc',
+      'content/screen_orientation_delegate_chromeos.h',
+      'content/shell_content_state.cc',
+      'content/shell_content_state.h',
     ],
     'ash_test_support_sources': [
       'desktop_background/desktop_background_controller_test_api.cc',
       'desktop_background/desktop_background_controller_test_api.h',
-      'shell/keyboard_controller_proxy_stub.cc',
-      'shell/keyboard_controller_proxy_stub.h',
       'shell/toplevel_window.cc',
       'shell/toplevel_window.h',
       'test/app_list_controller_test_api.cc',
@@ -724,6 +724,8 @@
       'test/task_switch_time_tracker_test_api.h',
       'test/test_activation_delegate.cc',
       'test/test_activation_delegate.h',
+      'test/test_keyboard_ui.cc',
+      'test/test_keyboard_ui.h',
       'test/test_lock_state_controller_delegate.cc',
       'test/test_lock_state_controller_delegate.h',
       'test/test_overlay_delegate.cc',
@@ -759,6 +761,10 @@
       'test/virtual_keyboard_test_helper.cc',
       'test/virtual_keyboard_test_helper.h',
     ],
+    'ash_test_support_with_content_sources': [
+      'test/content/test_shell_content_state.cc',
+      'test/content/test_shell_content_state.h',
+    ],
     'ash_shell_lib_sources': [
       '../ui/views/test/test_views_delegate_aura.cc',
       'shell/app_list.cc',
@@ -766,8 +772,6 @@
       'shell/context_menu.cc',
       'shell/context_menu.h',
       'shell/example_factory.h',
-      'shell/keyboard_controller_proxy_stub.cc',
-      'shell/keyboard_controller_proxy_stub.h',
       'shell/lock_view.cc',
       'shell/panel_window.cc',
       'shell/panel_window.h',
@@ -792,6 +796,8 @@
       'shell/content/client/shell_content_browser_client.h',
       'shell/content/client/shell_main_delegate.cc',
       'shell/content/client/shell_main_delegate.h',
+      'shell/content/shell_content_state_impl.cc',
+      'shell/content/shell_content_state_impl.h',
       'shell/content/shell_main_parts.cc',
       'shell/content/shell_main_parts.h',
     ],
@@ -805,11 +811,13 @@
       'ash_touch_exploration_manager_chromeos_unittest.cc',
       'autoclick/autoclick_unittest.cc',
       'content/display/screen_orientation_controller_chromeos_unittest.cc',
+      'content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc',
+      'content/keyboard_overlay/keyboard_overlay_view_unittest.cc',
       'desktop_background/desktop_background_controller_unittest.cc',
       'dip_unittest.cc',
       'display/cursor_window_controller_unittest.cc',
       'display/display_change_observer_chromeos_unittest.cc',
-      'display/window_tree_host_manager_unittest.cc',
+      'display/display_color_manager_chromeos_unittest.cc',
       'display/display_error_observer_chromeos_unittest.cc',
       'display/display_info_unittest.cc',
       'display/display_manager_unittest.cc',
@@ -820,8 +828,10 @@
       'display/projecting_observer_chromeos_unittest.cc',
       'display/resolution_notification_controller_unittest.cc',
       'display/root_window_transformers_unittest.cc',
+      'display/screen_ash_unittest.cc',
       'display/screen_position_controller_unittest.cc',
       'display/unified_mouse_warp_controller_unittest.cc',
+      'display/window_tree_host_manager_unittest.cc',
       'drag_drop/drag_drop_controller_unittest.cc',
       'drag_drop/drag_drop_tracker_unittest.cc',
       'extended_desktop_unittest.cc',
@@ -831,8 +841,6 @@
       'frame/custom_frame_view_ash_unittest.cc',
       'frame/default_header_painter_unittest.cc',
       'host/ash_window_tree_host_x11_unittest.cc',
-      'keyboard_overlay/keyboard_overlay_delegate_unittest.cc',
-      'keyboard_overlay/keyboard_overlay_view_unittest.cc',
       'magnifier/magnification_controller_unittest.cc',
       'metrics/desktop_task_switch_metric_recorder_unittest.cc',
       'metrics/task_switch_metrics_recorder_unittest.cc',
@@ -904,6 +912,7 @@
       'wm/panels/panel_layout_manager_unittest.cc',
       'wm/panels/panel_window_resizer_unittest.cc',
       'wm/resize_shadow_and_cursor_unittest.cc',
+      'wm/root_window_layout_manager_unittest.cc',
       'wm/screen_dimmer_unittest.cc',
       'wm/session_state_animator_impl_unittest.cc',
       'wm/stacking_controller_unittest.cc',
@@ -941,9 +950,10 @@
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../cc/cc.gyp:cc',
         '../components/components.gyp:device_event_log_component',
+        '../components/components.gyp:onc_component',
+        '../components/components.gyp:signin_core_account_id',
         '../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',
@@ -962,13 +972,12 @@
         '../ui/events/platform/events_platform.gyp:events_platform',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
+        '../ui/gfx/gfx.gyp:gfx_vector_icons',
         '../ui/keyboard/keyboard.gyp:keyboard',
         '../ui/message_center/message_center.gyp:message_center',
         '../ui/resources/ui_resources.gyp:ui_resources',
         '../ui/strings/ui_strings.gyp:ui_strings',
-        '../ui/views/controls/webview/webview.gyp:webview',
         '../ui/views/views.gyp:views',
-        '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
         '../ui/wm/wm.gyp:wm',
         '../url/url.gyp:url_lib',
         'ash_resources.gyp:ash_resources',
@@ -1024,8 +1033,8 @@
             '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/display_animator.cc',
+            'display/display_animator.h',
             'display/resolution_notification_controller.cc',
             'display/resolution_notification_controller.h',
             'system/tray/media_security/media_capture_observer.h',
@@ -1057,6 +1066,7 @@
         '../ui/events/events.gyp:events',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
+        '../ui/keyboard/keyboard.gyp:keyboard_with_content',
         '../ui/resources/ui_resources.gyp:ui_resources',
         '../ui/strings/ui_strings.gyp:ui_strings',
         '../ui/views/controls/webview/webview.gyp:webview',
@@ -1087,6 +1097,7 @@
         '../ui/views/views.gyp:views_test_support',
         'ash',
         'ash_resources.gyp:ash_resources',
+        'ash_test_support_with_content',
       ],
       'sources': [
         '<@(ash_test_support_sources)',
@@ -1094,21 +1105,24 @@
       'conditions': [
         ['OS=="win"', {
           'dependencies': [
-            '../ipc/ipc.gyp:ipc',
-            '../ui/metro_viewer/metro_viewer.gyp:metro_viewer_messages',
             '../ui/platform_window/win/win_window.gyp:win_window',
-            '../win8/win8.gyp:metro_viewer',
-            '../win8/win8.gyp:test_support_win8',
-            '../win8/win8_tests.gyp:test_registrar',
-          ],
-          'sources': [
-            'test/test_metro_viewer_process_host.cc',
-            'test/test_metro_viewer_process_host.h',
           ],
         }],
       ],
     },
     {
+      # GN version: //ash:test_support_with_content
+      'target_name': 'ash_test_support_with_content',
+      'type': 'static_library',
+      'dependencies': [
+        '../skia/skia.gyp:skia',
+        'ash_with_content',
+      ],
+      'sources': [
+        '<@(ash_test_support_with_content_sources)',
+      ],
+    },
+    {
       # GN version: //ash:interactive_ui_test_support
       'target_name': 'ash_interactive_ui_test_support',
       'type': 'static_library',
@@ -1131,6 +1145,7 @@
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../chrome/chrome_resources.gyp:packed_resources',
+        '../components/components.gyp:signin_core_account_id',
         '../components/components.gyp:user_manager',
         '../content/content.gyp:content_browser',
         '../content/content_shell_and_tests.gyp:test_support_content',
@@ -1154,6 +1169,7 @@
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/keyboard/keyboard.gyp:keyboard',
+        '../ui/keyboard/keyboard.gyp:keyboard_with_content',
         '../ui/message_center/message_center.gyp:message_center',
         '../ui/message_center/message_center.gyp:message_center_test_support',
         '../ui/resources/ui_resources.gyp:ui_resources',
@@ -1209,6 +1225,7 @@
             '../chromeos/chromeos.gyp:power_manager_proto',
             '../device/bluetooth/bluetooth.gyp:device_bluetooth',
             '../ui/display/display.gyp:display',
+            '../ui/display/display.gyp:display_test_support',
             '../ui/display/display.gyp:display_test_util',
             '../ui/display/display.gyp:display_types',
           ],
@@ -1254,6 +1271,7 @@
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/keyboard/keyboard.gyp:keyboard',
+        '../ui/keyboard/keyboard.gyp:keyboard_with_content',
         '../ui/message_center/message_center.gyp:message_center',
         '../ui/resources/ui_resources.gyp:ui_resources',
         '../ui/views/examples/examples.gyp:views_examples_lib',
@@ -1277,7 +1295,7 @@
       'dependencies': [
         'ash_shell_lib',
         '../content/content_shell_and_tests.gyp:content_shell_lib',
-        '../content/content.gyp:content',     
+        '../content/content.gyp:content',
         '../skia/skia.gyp:skia',
       ],
       'sources': [
@@ -1286,7 +1304,7 @@
       'conditions': [
         ['OS=="win"', {
           'dependencies': [
-            '../content/content.gyp:content_startup_helper_win',
+            '../content/content.gyp:sandbox_helper_win',
           ],
         }],
       ],
diff --git a/chromium/ash/ash_unittests.isolate b/chromium/ash/ash_unittests.isolate
index 94f9ea833ca..a210ff87cae 100644
--- a/chromium/ash/ash_unittests.isolate
+++ b/chromium/ash/ash_unittests.isolate
@@ -37,6 +37,14 @@
         ],
       },
     }],
+
+    ['chromeos==1', {
+      'variables': {
+        'files': [
+          'display/test_data/'
+        ],
+      },
+    }],
     ['OS=="linux"', {
       'variables': {
         'files': [