BASELINE: Update Chromium to 53.0.2785.41

Also adds a few extra files for extensions.

Change-Id: Iccdd55d98660903331cf8b7b29188da781830af4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

6 files changed, 68 insertions, 23 deletions

diff --git a/chromium/remoting/remoting.gyp b/chromium/remoting/remoting.gyp
index dae40c1508a..910079f8da8 100644
--- a/chromium/remoting/remoting.gyp
+++ b/chromium/remoting/remoting.gyp
@@ -49,6 +49,8 @@
       'BINARY_HOST_ME2ME=3',
       'BINARY_NATIVE_MESSAGING_HOST=4',
       'BINARY_REMOTE_ASSISTANCE_HOST=5',
+      'BINARY_REMOTE_SECURITY_KEY=6',
+      'BINARY_REMOTING_START_HOST=7',
     ],
     'include_dirs': [
       '..',  # Root of Chrome checkout
diff --git a/chromium/remoting/remoting_host.gypi b/chromium/remoting/remoting_host.gypi
index 0756fa91cd1..15c16f4c4f6 100644
--- a/chromium/remoting/remoting_host.gypi
+++ b/chromium/remoting/remoting_host.gypi
@@ -68,6 +68,10 @@
                     '../build/linux/system.gyp:xrandr',
                     '../build/linux/system.gyp:xtst',
                   ],
+                }, {
+                'sources!' : [
+                  'host/linux/unicode_to_keysym.cc',
+                ],
                 }],
                 ['chromeos==0 and use_ozone==0', {
                   'dependencies': [
@@ -105,7 +109,6 @@
                 ['use_ash==1', {
                   'dependencies': [
                     '../ash/ash.gyp:ash',
-                    '../ash/wm/common/ash_wm_common.gyp:ash_wm_common',
                   ],
                 }],
                 ['use_ozone==0', {
@@ -318,19 +321,6 @@
           }],
         },  # end of target 'remoting_native_messaging_manifests'
         {
-          # GN target: //remoting/host:remoting_start_host
-          'target_name': 'remoting_start_host',
-          'type': 'executable',
-          'dependencies': [
-            'remoting_host_setup_base',
-          ],
-          'sources': [
-            'host/setup/host_starter.cc',
-            'host/setup/host_starter.h',
-            'host/setup/start_host.cc',
-          ],
-        },  # end of target 'remoting_start_host'
-        {
           # GN: //remoting/host:remoting_infoplist_strings
           'target_name': 'remoting_infoplist_strings',
           'type': 'none',
@@ -623,6 +613,24 @@
     }], # end of OS!="win" and enable_me2me_host==1
 
     ['OS!="win" and enable_remoting_host==1', {
+      'targets': [
+        {
+          # GN target: //remoting/host:remoting_start_host
+          'target_name': 'remoting_start_host',
+          'type': 'executable',
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          'dependencies': [
+            'remoting_host_setup_base',
+          ],
+          'sources': [
+            'host/setup/host_starter.cc',
+            'host/setup/host_starter.h',
+            'host/setup/start_host_entry_point.cc',
+            'host/setup/start_host_main.cc',
+            'host/setup/start_host_main.h',
+          ],
+        },  # end of target 'remoting_start_host'
+      ],
       'conditions': [
         ['chromeos==0', {
           'targets': [
diff --git a/chromium/remoting/remoting_host_srcs.gypi b/chromium/remoting/remoting_host_srcs.gypi
index 6d50c1d46bd..f4bd033e1e9 100644
--- a/chromium/remoting/remoting_host_srcs.gypi
+++ b/chromium/remoting/remoting_host_srcs.gypi
@@ -46,6 +46,7 @@
       'host/client_session.cc',
       'host/client_session.h',
       'host/client_session_control.h',
+      'host/client_session_details.h',
       'host/clipboard.h',
       'host/clipboard_mac.mm',
       'host/clipboard_win.cc',
diff --git a/chromium/remoting/remoting_host_win.gypi b/chromium/remoting/remoting_host_win.gypi
index 0d84b352a16..475f6030b6c 100644
--- a/chromium/remoting/remoting_host_win.gypi
+++ b/chromium/remoting/remoting_host_win.gypi
@@ -228,8 +228,12 @@
         'host/it2me/it2me_native_messaging_host_main.h',
         'host/security_key/remote_security_key_main.cc',
         'host/security_key/remote_security_key_main.h',
+        'host/setup/host_starter.cc',
+        'host/setup/host_starter.h',
         'host/setup/me2me_native_messaging_host_main.cc',
         'host/setup/me2me_native_messaging_host_main.h',
+        'host/setup/start_host_main.cc',
+        'host/setup/start_host_main.h',
         'host/win/chromoting_module.cc',
         'host/win/chromoting_module.h',
         'host/win/core.cc',
@@ -258,6 +262,7 @@
             'comctl32.lib',
             'rpcns4.lib',
             'rpcrt4.lib',
+            'sas.lib',
             'uuid.lib',
             'wtsapi32.lib',
           ],
@@ -354,6 +359,29 @@
       },
     },  # end of target 'remoting_me2me_host'
     {
+      # GN target: //remoting/host:remoting_start_host
+      'target_name': 'remoting_start_host',
+      'type': 'executable',
+      'variables': { 'enable_wexit_time_destructors': 1, },
+      'defines': [
+        'BINARY=BINARY_REMOTING_START_HOST',
+      ],
+      'dependencies': [
+        'remoting_core',
+        'remoting_windows_resources',
+      ],
+      'sources': [
+        '<(SHARED_INTERMEDIATE_DIR)/remoting/version.rc',
+        'host/setup/start_host_entry_point.cc',
+      ],
+      'msvs_settings': {
+        'VCLinkerTool': {
+          'IgnoreAllDefaultLibraries': 'true',
+          'SubSystem': '1', # /SUBSYSTEM:CONSOLE
+        },
+      },
+    },  # end of target 'remoting_start_host'
+    {
       # GN version: //remoting/host:remote_security_key
       'target_name': 'remote_security_key',
       'type': 'executable',
@@ -535,7 +563,9 @@
     # component build is used the produced installation will not work due to
     # missing DLLs. We build it anyway to make sure the GYP scripts are executed
     # by the bots.
-    ['wix_exists == "True" and sas_dll_exists == "True"', {
+    # We do not release a 64 bits binary. So to avoid any potential
+    # misunderstanding, we only build 32 bits MSI file.
+    ['wix_exists == "True" and target_arch == "ia32"', {
       'targets': [
         {
           'target_name': 'remoting_host_installation',
@@ -623,7 +653,6 @@
           ],
           'generated_files': [
             '<@(_compiled_inputs)',
-            '<(sas_dll_path)/sas.dll',
             '<(SHARED_INTERMEDIATE_DIR)/remoting/CREDITS.txt',
             '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_assistance.json',
             '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_desktop.json',
@@ -632,7 +661,6 @@
           ],
           'generated_files_dst': [
             '<@(_compiled_inputs_dst)',
-            'files/sas.dll',
             'files/CREDITS.txt',
             'files/com.google.chrome.remote_assistance.json',
             'files/com.google.chrome.remote_desktop.json',
@@ -652,7 +680,6 @@
               ],
               'inputs': [
                 '<@(_compiled_inputs)',
-                '<(sas_dll_path)/sas.dll',
                 '<@(_source_files)',
                 'host/installer/build-installer-archive.py',
                 'resources/chromoting.ico',
@@ -687,7 +714,7 @@
           'type': 'none',
         },
       ],  # end of 'targets'
-    }],  # 'wix_exists == "True" and sas_dll_exists == "True"'
+    }],  # 'wix_exists == "True"
 
   ],  # end of 'conditions'
 }
diff --git a/chromium/remoting/remoting_srcs.gypi b/chromium/remoting/remoting_srcs.gypi
index 9d9fc2f2d41..38034e8db02 100644
--- a/chromium/remoting/remoting_srcs.gypi
+++ b/chromium/remoting/remoting_srcs.gypi
@@ -84,8 +84,6 @@
       'protocol/authenticator.cc',
       'protocol/authenticator.h',
       'protocol/capability_names.h',
-      'protocol/client_authentication_config.cc',
-      'protocol/client_authentication_config.h',
       'protocol/channel_authenticator.h',
       'protocol/channel_dispatcher_base.cc',
       'protocol/channel_dispatcher_base.h',
@@ -93,6 +91,8 @@
       'protocol/channel_multiplexer.h',
       'protocol/channel_socket_adapter.cc',
       'protocol/channel_socket_adapter.h',
+      'protocol/client_authentication_config.cc',
+      'protocol/client_authentication_config.h',
       'protocol/client_control_dispatcher.cc',
       'protocol/client_control_dispatcher.h',
       'protocol/client_event_dispatcher.cc',
@@ -116,6 +116,8 @@
       'protocol/errors.cc',
       'protocol/errors.h',
       'protocol/frame_consumer.h',
+      'protocol/frame_stats.cc',
+      'protocol/frame_stats.h',
       'protocol/host_control_dispatcher.cc',
       'protocol/host_control_dispatcher.h',
       'protocol/host_event_dispatcher.cc',
@@ -245,8 +247,6 @@
       'protocol/webrtc_data_stream_adapter.h',
       'protocol/webrtc_dummy_video_capturer.cc',
       'protocol/webrtc_dummy_video_capturer.h',
-      'protocol/webrtc_frame_scheduler.cc',
-      'protocol/webrtc_frame_scheduler.h',
       'protocol/webrtc_video_encoder_factory.cc',
       'protocol/webrtc_video_encoder_factory.h',
       'protocol/webrtc_transport.cc',
@@ -278,6 +278,7 @@
     ],
 
     'remoting_client_sources': [
+      'client/audio_consumer.h',
       'client/audio_decode_scheduler.cc',
       'client/audio_decode_scheduler.h',
       'client/audio_player.cc',
diff --git a/chromium/remoting/remoting_test.gypi b/chromium/remoting/remoting_test.gypi
index 3ba7932bbe1..6a9c56c5fba 100644
--- a/chromium/remoting/remoting_test.gypi
+++ b/chromium/remoting/remoting_test.gypi
@@ -307,6 +307,7 @@
         'host/security_key/gnubby_auth_handler_win_unittest.cc',
         'host/security_key/gnubby_extension_session_unittest.cc',
         'host/security_key/remote_security_key_ipc_client_unittest.cc',
+        'host/security_key/remote_security_key_ipc_constants.cc',
         'host/security_key/remote_security_key_ipc_server_unittest.cc',
         'host/security_key/remote_security_key_message_handler_unittest.cc',
         'host/security_key/remote_security_key_message_reader_impl_unittest.cc',
@@ -406,6 +407,11 @@
             'host/local_input_monitor_unittest.cc',
           ],
         }],
+        ['use_x11 == 0', {
+          'sources!' : [
+            'host/linux/unicode_to_keysym_unittest.cc',
+          ]
+        }],
         [ 'use_ozone==1', {
           'sources!': [
             'host/local_input_monitor_unittest.cc',