BASELINE: Update Chromium to 49.0.2623.23

Also adds missing printing sources.

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

13 files changed, 161 insertions, 83 deletions

diff --git a/chromium/remoting/app_remoting_webapp_files.gypi b/chromium/remoting/app_remoting_webapp_files.gypi
index 7454ab84656..ecf9c1f688f 100644
--- a/chromium/remoting/app_remoting_webapp_files.gypi
+++ b/chromium/remoting/app_remoting_webapp_files.gypi
@@ -28,10 +28,12 @@
     'ar_feedback_consent_html_all_js_files': [
       'webapp/app_remoting/js/feedback_consent.js',
       'webapp/base/js/base.js',
+      'webapp/base/js/chromoting_event.js',
       'webapp/base/js/error.js',
       'webapp/base/js/identity.js',
       'webapp/base/js/oauth2_api.js',
       'webapp/base/js/oauth2_api_impl.js',
+      'webapp/base/js/platform.js',
       'webapp/base/js/plugin_settings.js',
       'webapp/base/js/l10n.js',
       'webapp/base/js/xhr.js',
diff --git a/chromium/remoting/compile_js.gypi b/chromium/remoting/compile_js.gypi
index 340e01a390f..9ad7d3bd7df 100644
--- a/chromium/remoting/compile_js.gypi
+++ b/chromium/remoting/compile_js.gypi
@@ -8,11 +8,10 @@
       '../third_party/closure_compiler/externs/metrics_private.js'],
     'script_args': ['--no-single-file'],
     'closure_args': [
-      'jscomp_error=reportUnknownTypes',
       'jscomp_error=duplicate',
       'jscomp_error=misplacedTypeAnnotation',
     ],
     'disabled_closure_args': [],
   },
   'includes': ['../third_party/closure_compiler/compile_js.gypi'],
-}
\ No newline at end of file
+}
diff --git a/chromium/remoting/remoting.gyp b/chromium/remoting/remoting.gyp
index 7d7b992b52e..b645eff99b0 100644
--- a/chromium/remoting/remoting.gyp
+++ b/chromium/remoting/remoting.gyp
@@ -237,6 +237,7 @@
         '../net/net.gyp:net',
         '../third_party/expat/expat.gyp:expat',
         '../third_party/libjingle/libjingle.gyp:libjingle',
+        '../third_party/libyuv/libyuv.gyp:libyuv',
         'remoting_base',
       ],
       'export_dependent_settings': [
@@ -244,8 +245,17 @@
       ],
       'sources': [
         '<@(remoting_protocol_sources)',
+        '<@(remoting_protocol_nonnacl_sources)',
         '<@(remoting_signaling_sources)',
       ],
+      'conditions': [
+        ['enable_webrtc==1', {
+          'dependencies': [
+            '../third_party/libjingle/libjingle.gyp:libjingle_webrtc',
+            '../third_party/libjingle/libjingle.gyp:libpeerconnection',
+          ],
+        }],
+      ],
     },  # end of target 'remoting_protocol'
   ],  # end of targets
 }
diff --git a/chromium/remoting/remoting_android.gypi b/chromium/remoting/remoting_android.gypi
index 14ce25fb49e..eb0a13d9c8d 100644
--- a/chromium/remoting/remoting_android.gypi
+++ b/chromium/remoting/remoting_android.gypi
@@ -23,6 +23,7 @@
           'sources': [
             'android/java/src/org/chromium/chromoting/jni/Client.java',
             'android/java/src/org/chromium/chromoting/jni/JniInterface.java',
+            'android/java/src/org/chromium/chromoting/jni/TouchEventData.java',
           ],
           'variables': {
             'jni_gen_package': 'remoting',
@@ -52,6 +53,8 @@
             'client/jni/jni_client.h',
             'client/jni/jni_frame_consumer.cc',
             'client/jni/jni_frame_consumer.h',
+            'client/jni/jni_touch_event_data.cc',
+            'client/jni/jni_touch_event_data.h',
             'client/jni/remoting_jni_onload.cc',
             'client/jni/remoting_jni_registrar.cc',
             'client/jni/remoting_jni_registrar.h',
@@ -134,7 +137,31 @@
               },
             }],
           ],
-        },
+        },  # end of target 'remoting_android_client_java'
+        {
+          # TODO(lambroslambrou): Move some of this to third_party/cardboard-java/ in case it is
+          # useful to other clients. Also implement this for GN builds.
+          'target_name': 'remoting_cardboard_extract_native_lib',
+          'type': 'none',
+          'actions': [
+            {
+              'action_name': 'extract_cardboard_native_lib',
+              'inputs': [
+                '../third_party/cardboard-java/src/CardboardSample/libs/cardboard.jar',
+              ],
+              'outputs': [
+                '<(SHARED_LIB_DIR)/libvrtoolkit.so',
+              ],
+              'action': [
+                'python',
+                'tools/extract_android_native_lib.py',
+                '<(android_app_abi)',
+                '<@(_inputs)',
+                '<@(_outputs)',
+              ],
+            },
+          ],
+        },  # end of target 'remoting_cardboard_extract_native_lib'
         {
           'target_name': 'remoting_apk',
           'type': 'none',
@@ -145,34 +172,62 @@
             '<@(remoting_apk_extra_dependencies)',
           ],
           'variables': {
-            'apk_name': '<!(python <(version_py_path) -f <(branding_path) -t "@APK_FILE_NAME@")',
-            'android_app_version_name': '<(version_full)',
-            'android_app_version_code': '<!(python tools/android_version.py <(android_app_version_name))',
+            'apk_name': 'Chromoting',
             'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/remoting/android/AndroidManifest.xml',
             'java_in_dir': '<(remoting_apk_java_in_dir)',
             'native_lib_target': 'libremoting_client_jni',
           },
           'includes': [ '../build/java_apk.gypi' ],
+          'conditions': [
+            ['target_arch == "arm"', {
+              'dependencies': [ 'remoting_cardboard_extract_native_lib' ],
+              'variables': {
+                'extra_native_libs': [ '<(SHARED_LIB_DIR)/libvrtoolkit.so' ],
+              },
+            }],
+          ],
         },  # end of target 'remoting_apk'
         {
+          'target_name': 'remoting_test_apk_manifest',
+          'type': 'none',
+          'sources': [
+            'android/javatests/AndroidManifest.xml.jinja2',
+          ],
+          'rules': [{
+            'rule_name': 'generate_manifest',
+            'extension': 'jinja2',
+            'inputs': [
+              '<(remoting_localize_path)',
+              '<(branding_path)',
+            ],
+            'outputs': [
+              '<(SHARED_INTERMEDIATE_DIR)/remoting/android_test/<(RULE_INPUT_ROOT)',
+            ],
+            'action': [
+              'python', '<(remoting_localize_path)',
+              '--variables', '<(branding_path)',
+              '--template', '<(RULE_INPUT_PATH)',
+              '--locale_output', '<@(_outputs)',
+              'en',
+            ],
+          }],
+        },  # end of target 'remoting_test_apk_manifest'
+        {
           'target_name': 'remoting_test_apk',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base_java_test_support',
             'remoting_android_client_java',
+            'remoting_test_apk_manifest',
           ],
           'variables': {
             'apk_name': 'ChromotingTest',
+            'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/remoting/android_test/AndroidManifest.xml',
             'java_in_dir': 'android/javatests',
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },  # end of target 'remoting_test_apk'
-      ], # end of 'targets'
-    }],  # 'OS=="android"'
-
-    ['OS=="android"', {
-      'targets': [
         {
           'target_name': 'remoting_unittests_apk',
           'type': 'none',
@@ -183,8 +238,8 @@
             'test_suite_name': 'remoting_unittests',
           },
           'includes': [ '../build/apk_test.gypi' ],
-        },
-      ],
+        },  # end of target 'remoting_unittests_apk'
+      ],  # end of 'targets'
     }],  # 'OS=="android"
   ],  # end of 'conditions'
 }
diff --git a/chromium/remoting/remoting_host.gypi b/chromium/remoting/remoting_host.gypi
index de2a5d96288..4ec28b1d8f8 100644
--- a/chromium/remoting/remoting_host.gypi
+++ b/chromium/remoting/remoting_host.gypi
@@ -95,6 +95,7 @@
               'sources!' : [
                 'host/clipboard_x11.cc',
                 'host/continue_window_linux.cc',
+                'host/curtain_mode_linux.cc',
                 'host/disconnect_window_linux.cc',
                 'host/linux/x_server_clipboard.cc',
                 'host/linux/x_server_clipboard.h',
@@ -181,7 +182,6 @@
             ['enable_webrtc==1', {
               'dependencies': [
                 '../third_party/webrtc/modules/modules.gyp:desktop_capture',
-                '../third_party/libjingle/libjingle.gyp:libpeerconnection',
               ],
               'sources': [
                 '<@(remoting_cast_sources)',
@@ -264,6 +264,7 @@
 
         # Generates native messaging manifest files.
         {
+          # GN: //remoting/host:remoting_native_messaging_manifests
           'target_name': 'remoting_native_messaging_manifests',
           'type': 'none',
           'conditions': [
@@ -339,6 +340,7 @@
           ],
         },  # end of target 'remoting_start_host'
         {
+          # GN: //remoting/host:remoting_infoplist_strings
           'target_name': 'remoting_infoplist_strings',
           'type': 'none',
           'dependencies': [
@@ -419,14 +421,8 @@
             'VERSION=<(version_full)',
           ],
           'sources': [
-            'host/curtain_mode.h',
-            'host/curtain_mode_linux.cc',
-            'host/curtain_mode_mac.cc',
-            'host/curtain_mode_win.cc',
             'host/pam_authorization_factory_posix.cc',
             'host/pam_authorization_factory_posix.h',
-            'host/posix/signal_handler.cc',
-            'host/posix/signal_handler.h',
             'host/remoting_me2me_host.cc',
           ],
           'conditions': [
@@ -557,6 +553,7 @@
           ],  # end of 'conditions'
         },  # end of target 'remoting_me2me_host'
         {
+          # GN: //remoting/host:native_messaging_host
           'target_name': 'remoting_me2me_native_messaging_host',
           'type': 'executable',
           'product_name': 'native_messaging_host',
@@ -649,6 +646,7 @@
         ['chromeos==0', {
           'targets': [
             {
+              # GN: //remoting/host/it2me:remote_assistance_host
               'target_name': 'remoting_it2me_native_messaging_host',
               'type': 'executable',
               'product_name': 'remote_assistance_host',
diff --git a/chromium/remoting/remoting_host_linux.gypi b/chromium/remoting/remoting_host_linux.gypi
index f9b89ea10c5..ec890eaa4a9 100644
--- a/chromium/remoting/remoting_host_linux.gypi
+++ b/chromium/remoting/remoting_host_linux.gypi
@@ -8,7 +8,7 @@
 
       'variables': {
         'build_deb_script': 'host/installer/linux/build-deb.sh',
-        'deb_filename': 'host/installer/<!(["<(build_deb_script)", "-p", "-s", "<(DEPTH)"])',
+        'deb_filename': '<(PRODUCT_DIR)/<!(["<(build_deb_script)", "-p", "-s", "<(DEPTH)"])',
         'packaging_outputs': [
           '<(deb_filename)',
           '<!(echo <(deb_filename) | sed -e "s/.deb$/.changes/")',
@@ -84,7 +84,11 @@
               'outputs': [
                 '<@(packaging_outputs)',
               ],
-              'action': [ '<(build_deb_script)', '-s', '<(DEPTH)' ],
+              'action': [
+                '<(build_deb_script)',
+                '-s', '<(DEPTH)',
+                '-o', '<(PRODUCT_DIR)'
+              ],
             },
           ],
         },
diff --git a/chromium/remoting/remoting_host_mac.gypi b/chromium/remoting/remoting_host_mac.gypi
index 064d86bd684..fb03e282264 100644
--- a/chromium/remoting/remoting_host_mac.gypi
+++ b/chromium/remoting/remoting_host_mac.gypi
@@ -178,7 +178,10 @@
         'prefpane_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_PREFPANE_BUNDLE_NAME@")',
       },
       'dependencies': [
+        'remoting_base',
+        'remoting_host',
         'remoting_infoplist_strings',
+        '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
       ],
       'defines': [
         'HOST_BUNDLE_NAME="<(host_bundle_name)"',
@@ -190,21 +193,7 @@
         '../third_party/jsoncpp/source/include/',
         '../third_party/jsoncpp/source/src/lib_json/',
       ],
-
-      # These source files are included directly, instead of adding target
-      # dependencies, because the targets are not yet built for 64-bit on
-      # Mac OS X - http://crbug.com/125116.
-      #
-      # TODO(lambroslambrou): Fix this when Chrome supports building for
-      # Mac OS X 64-bit - http://crbug.com/128122.
       'sources': [
-        '../third_party/jsoncpp/overrides/src/lib_json/json_value.cpp',
-        '../third_party/jsoncpp/source/src/lib_json/json_reader.cpp',
-        '../third_party/jsoncpp/source/src/lib_json/json_writer.cpp',
-        '../third_party/modp_b64/modp_b64.cc',
-        'host/constants_mac.cc',
-        'host/constants_mac.h',
-        'host/host_config_constants.cc',
         'host/mac/me2me_preference_pane.h',
         'host/mac/me2me_preference_pane.mm',
         'host/mac/me2me_preference_pane_confirm_pin.h',
@@ -221,7 +210,6 @@
         ],
       },
       'xcode_settings': {
-        'ARCHS': ['i386', 'x86_64'],
         'GCC_ENABLE_OBJC_GC': 'supported',
         'INFOPLIST_FILE': 'host/mac/me2me_preference_pane-Info.plist',
         'INFOPLIST_PREPROCESS': 'YES',
diff --git a/chromium/remoting/remoting_host_srcs.gypi b/chromium/remoting/remoting_host_srcs.gypi
index 363a67d581f..766d5566724 100644
--- a/chromium/remoting/remoting_host_srcs.gypi
+++ b/chromium/remoting/remoting_host_srcs.gypi
@@ -22,8 +22,6 @@
       'host/basic_desktop_environment.h',
       'host/branding.cc',
       'host/branding.h',
-      'host/capture_scheduler.cc',
-      'host/capture_scheduler.h',
       'host/chromeos/aura_desktop_capturer.cc',
       'host/chromeos/aura_desktop_capturer.h',
       'host/chromeos/clipboard_aura.cc',
@@ -36,8 +34,6 @@
       'host/chromeos/point_transformer.h',
       'host/chromeos/skia_bitmap_desktop_frame.cc',
       'host/chromeos/skia_bitmap_desktop_frame.h',
-      'host/chromium_port_allocator_factory.cc',
-      'host/chromium_port_allocator_factory.h',
       'host/chromoting_host.cc',
       'host/chromoting_host.h',
       'host/chromoting_host_context.cc',
@@ -64,6 +60,10 @@
       'host/continue_window_linux.cc',
       'host/continue_window_mac.mm',
       'host/continue_window_win.cc',
+      'host/curtain_mode.h',
+      'host/curtain_mode_linux.cc',
+      'host/curtain_mode_mac.cc',
+      'host/curtain_mode_win.cc',
       'host/daemon_process.cc',
       'host/daemon_process.h',
       'host/daemon_process_win.cc',
@@ -182,8 +182,6 @@
       'host/logging_win.cc',
       'host/me2me_desktop_environment.cc',
       'host/me2me_desktop_environment.h',
-      'host/mouse_clamping_filter.cc',
-      'host/mouse_clamping_filter.h',
       'host/mouse_shape_pump.cc',
       'host/mouse_shape_pump.h',
       'host/oauth_token_getter.cc',
@@ -201,6 +199,8 @@
       'host/pin_hash.h',
       'host/policy_watcher.cc',
       'host/policy_watcher.h',
+      'host/posix/signal_handler.cc',
+      'host/posix/signal_handler.h',
       'host/register_support_host_request.cc',
       'host/register_support_host_request.h',
       'host/remote_input_filter.cc',
@@ -218,8 +218,6 @@
       'host/screen_resolution.h',
       'host/server_log_entry_host.cc',
       'host/server_log_entry_host.h',
-      'host/session_manager_factory.cc',
-      'host/session_manager_factory.h',
       'host/shaped_desktop_capturer.cc',
       'host/shaped_desktop_capturer.h',
       'host/shutdown_watchdog.cc',
@@ -247,8 +245,6 @@
       'host/usage_stats_consent_win.cc',
       'host/username.cc',
       'host/username.h',
-      'host/video_frame_pump.cc',
-      'host/video_frame_pump.h',
       'host/video_frame_recorder.cc',
       'host/video_frame_recorder.h',
       'host/video_frame_recorder_host_extension.cc',
@@ -320,8 +316,6 @@
       'host/cast_extension.h',
       'host/cast_extension_session.cc',
       'host/cast_extension_session.h',
-      'host/cast_video_capturer_adapter.cc',
-      'host/cast_video_capturer_adapter.h',
     ],
     'remoting_it2me_host_static_sources' : [
       'host/it2me/it2me_confirmation_dialog.cc',
diff --git a/chromium/remoting/remoting_host_win.gypi b/chromium/remoting/remoting_host_win.gypi
index 9c0b3e9e07f..d4cdfd62498 100644
--- a/chromium/remoting/remoting_host_win.gypi
+++ b/chromium/remoting/remoting_host_win.gypi
@@ -104,6 +104,8 @@
           '-Wno-incompatible-pointer-types',
           # Generated code contains unused variables.
           '-Wno-unused-variable',
+          # PROXYFILE_LIST_START is an extern with initializer.
+          '-Wno-extern-initializer',
         ],
       },
     },  # end of target 'remoting_lib_ps'
diff --git a/chromium/remoting/remoting_nacl.gyp b/chromium/remoting/remoting_nacl.gyp
index 6604231f2d3..3c5a2848ea0 100644
--- a/chromium/remoting/remoting_nacl.gyp
+++ b/chromium/remoting/remoting_nacl.gyp
@@ -123,16 +123,16 @@
       ],
       'sources!': [
         'base/url_request_context_getter.cc',
-        'protocol/chromium_socket_factory.cc',
       ],
 
-      # Include normalizing_input_filter_mac.cc excluded by the filename
+      # Include normalizing_input_filter_*.cc excluded by the filename
       # exclusion rules. Must be in target_conditions to make sure it's
       # evaluated after the filename rules.
       'target_conditions': [
         ['1==1', {
           'sources/': [
             [ 'include', 'client/normalizing_input_filter_mac.cc' ],
+            [ 'include', 'client/normalizing_input_filter_win.cc' ],
           ],
         }],
       ],
diff --git a/chromium/remoting/remoting_srcs.gypi b/chromium/remoting/remoting_srcs.gypi
index dc5d7c74fe4..8f16e55e926 100644
--- a/chromium/remoting/remoting_srcs.gypi
+++ b/chromium/remoting/remoting_srcs.gypi
@@ -19,8 +19,6 @@
       'base/compound_buffer.h',
       'base/constants.cc',
       'base/constants.h',
-      'base/plugin_thread_task_runner.cc',
-      'base/plugin_thread_task_runner.h',
       'base/rate_counter.cc',
       'base/rate_counter.h',
       'base/rsa_key_pair.cc',
@@ -88,10 +86,6 @@
       'protocol/channel_multiplexer.h',
       'protocol/channel_socket_adapter.cc',
       'protocol/channel_socket_adapter.h',
-      'protocol/chromium_port_allocator.cc',
-      'protocol/chromium_port_allocator.h',
-      'protocol/chromium_socket_factory.cc',
-      'protocol/chromium_socket_factory.h',
       'protocol/client_control_dispatcher.cc',
       'protocol/client_control_dispatcher.h',
       'protocol/client_event_dispatcher.cc',
@@ -106,16 +100,15 @@
       'protocol/clipboard_stub.h',
       'protocol/clipboard_thread_proxy.cc',
       'protocol/clipboard_thread_proxy.h',
-      'protocol/connection_to_client.cc',
       'protocol/connection_to_client.h',
+      'protocol/connection_to_host.cc',
       'protocol/connection_to_host.h',
-      'protocol/connection_to_host_impl.cc',
-      'protocol/connection_to_host_impl.h',
       'protocol/content_description.cc',
       'protocol/content_description.h',
       'protocol/datagram_channel_factory.h',
       'protocol/errors.cc',
       'protocol/errors.h',
+      'protocol/frame_consumer.h',
       'protocol/host_control_dispatcher.cc',
       'protocol/host_control_dispatcher.h',
       'protocol/host_event_dispatcher.cc',
@@ -123,6 +116,12 @@
       'protocol/host_stub.h',
       'protocol/host_video_dispatcher.cc',
       'protocol/host_video_dispatcher.h',
+      'protocol/ice_connection_to_host.cc',
+      'protocol/ice_connection_to_host.h',
+      'protocol/ice_transport.cc',
+      'protocol/ice_transport.h',
+      'protocol/ice_transport_channel.cc',
+      'protocol/ice_transport_channel.h',
       'protocol/input_event_tracker.cc',
       'protocol/input_event_tracker.h',
       'protocol/input_filter.cc',
@@ -136,8 +135,6 @@
       'protocol/jingle_session.h',
       'protocol/jingle_session_manager.cc',
       'protocol/jingle_session_manager.h',
-      'protocol/libjingle_transport_factory.cc',
-      'protocol/libjingle_transport_factory.h',
       'protocol/me2me_host_authenticator_factory.cc',
       'protocol/me2me_host_authenticator_factory.h',
       'protocol/message_decoder.cc',
@@ -170,16 +167,15 @@
       'protocol/pairing_registry.h',
       'protocol/performance_tracker.cc',
       'protocol/performance_tracker.h',
+      'protocol/port_allocator_base.cc',
+      'protocol/port_allocator_base.h',
+      'protocol/port_allocator_factory.h',
       'protocol/port_range.cc',
       'protocol/port_range.h',
       'protocol/pseudotcp_adapter.cc',
       'protocol/pseudotcp_adapter.h',
       'protocol/pseudotcp_channel_factory.cc',
       'protocol/pseudotcp_channel_factory.h',
-      'protocol/quic_channel.cc',
-      'protocol/quic_channel.h',
-      'protocol/quic_channel_factory.cc',
-      'protocol/quic_channel_factory.h',
       'protocol/secure_channel_factory.cc',
       'protocol/secure_channel_factory.h',
       'protocol/session.h',
@@ -200,12 +196,40 @@
       'protocol/token_validator.h',
       'protocol/transport.cc',
       'protocol/transport.h',
-      'protocol/usb_key_codes.h',
+      'protocol/transport_context.cc',
+      'protocol/transport_context.h',
       'protocol/v2_authenticator.cc',
       'protocol/v2_authenticator.h',
+      'protocol/video_renderer.h',
       'protocol/video_stub.h',
     ],
 
+    # Files in protocol that don't compile for NaCl.
+    'remoting_protocol_nonnacl_sources': [
+      'protocol/capture_scheduler.cc',
+      'protocol/capture_scheduler.h',
+      'protocol/chromium_port_allocator.cc',
+      'protocol/chromium_port_allocator.h',
+      'protocol/chromium_socket_factory.cc',
+      'protocol/chromium_socket_factory.h',
+      'protocol/ice_connection_to_client.cc',
+      'protocol/ice_connection_to_client.h',
+      'protocol/video_frame_pump.cc',
+      'protocol/video_frame_pump.h',
+      'protocol/webrtc_connection_to_client.cc',
+      'protocol/webrtc_connection_to_client.h',
+      'protocol/webrtc_connection_to_host.cc',
+      'protocol/webrtc_connection_to_host.h',
+      'protocol/webrtc_data_stream_adapter.cc',
+      'protocol/webrtc_data_stream_adapter.h',
+      'protocol/webrtc_transport.cc',
+      'protocol/webrtc_transport.h',
+      'protocol/webrtc_video_capturer_adapter.cc',
+      'protocol/webrtc_video_capturer_adapter.h',
+      'protocol/webrtc_video_stream.cc',
+      'protocol/webrtc_video_stream.h',
+    ],
+
     'remoting_signaling_sources': [
       'signaling/iq_sender.cc',
       'signaling/iq_sender.h',
@@ -242,13 +266,14 @@
       'client/client_user_interface.h',
       'client/empty_cursor_filter.cc',
       'client/empty_cursor_filter.h',
-      'client/frame_consumer.h',
       'client/key_event_mapper.cc',
       'client/key_event_mapper.h',
       'client/normalizing_input_filter_cros.cc',
       'client/normalizing_input_filter_cros.h',
       'client/normalizing_input_filter_mac.cc',
       'client/normalizing_input_filter_mac.h',
+      'client/normalizing_input_filter_win.cc',
+      'client/normalizing_input_filter_win.h',
       'client/server_log_entry_client.cc',
       'client/server_log_entry_client.h',
       'client/software_video_renderer.cc',
@@ -257,7 +282,6 @@
       'client/token_fetcher_proxy.h',
       'client/touch_input_scaler.cc',
       'client/touch_input_scaler.h',
-      'client/video_renderer.h',
     ],
 
     'remoting_client_plugin_sources': [
@@ -280,8 +304,8 @@
       'client/plugin/pepper_network_manager.h',
       'client/plugin/pepper_packet_socket_factory.cc',
       'client/plugin/pepper_packet_socket_factory.h',
-      'client/plugin/pepper_plugin_thread_delegate.cc',
-      'client/plugin/pepper_plugin_thread_delegate.h',
+      'client/plugin/pepper_main_thread_task_runner.cc',
+      'client/plugin/pepper_main_thread_task_runner.h',
       'client/plugin/pepper_port_allocator.cc',
       'client/plugin/pepper_port_allocator.h',
       'client/plugin/pepper_util.cc',
diff --git a/chromium/remoting/remoting_test.gypi b/chromium/remoting/remoting_test.gypi
index 996760c4a1f..fe8edf4868a 100644
--- a/chromium/remoting/remoting_test.gypi
+++ b/chromium/remoting/remoting_test.gypi
@@ -21,8 +21,6 @@
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
-        'host/fake_desktop_capturer.cc',
-        'host/fake_desktop_capturer.h',
         'host/fake_desktop_environment.cc',
         'host/fake_desktop_environment.h',
         'host/fake_host_extension.cc',
@@ -34,14 +32,20 @@
         'host/fake_oauth_token_getter.h',
         'protocol/fake_authenticator.cc',
         'protocol/fake_authenticator.h',
+        'protocol/fake_connection_to_client.cc',
+        'protocol/fake_connection_to_client.h',
         'protocol/fake_connection_to_host.cc',
         'protocol/fake_connection_to_host.h',
         'protocol/fake_datagram_socket.cc',
         'protocol/fake_datagram_socket.h',
+        'protocol/fake_desktop_capturer.cc',
+        'protocol/fake_desktop_capturer.h',
         'protocol/fake_session.cc',
         'protocol/fake_session.h',
         'protocol/fake_stream_socket.cc',
         'protocol/fake_stream_socket.h',
+        'protocol/fake_video_renderer.cc',
+        'protocol/fake_video_renderer.h',
         'protocol/protocol_mock_objects.cc',
         'protocol/protocol_mock_objects.h',
         'protocol/test_event_matchers.h',
@@ -229,6 +233,7 @@
         'client/key_event_mapper_unittest.cc',
         'client/normalizing_input_filter_cros_unittest.cc',
         'client/normalizing_input_filter_mac_unittest.cc',
+        'client/normalizing_input_filter_win_unittest.cc',
         'client/server_log_entry_client_unittest.cc',
         'client/software_video_renderer_unittest.cc',
         'client/touch_input_scaler_unittest.cc',
@@ -244,7 +249,6 @@
         'host/backoff_timer_unittest.cc',
         'host/branding.cc',
         'host/branding.h',
-        'host/capture_scheduler_unittest.cc',
         'host/chromeos/aura_desktop_capturer_unittest.cc',
         'host/chromeos/clipboard_aura_unittest.cc',
         'host/chromoting_host_context_unittest.cc',
@@ -294,7 +298,6 @@
         'host/third_party_auth_config_unittest.cc',
         'host/token_validator_factory_impl_unittest.cc',
         'host/touch_injector_win_unittest.cc',
-        'host/video_frame_pump_unittest.cc',
         'host/video_frame_recorder_unittest.cc',
         'host/win/rdp_client_unittest.cc',
         'host/win/worker_process_launcher.cc',
@@ -302,6 +305,7 @@
         'host/win/worker_process_launcher_unittest.cc',
         'protocol/authenticator_test_base.cc',
         'protocol/authenticator_test_base.h',
+        'protocol/capture_scheduler_unittest.cc',
         'protocol/channel_multiplexer_unittest.cc',
         'protocol/channel_socket_adapter_unittest.cc',
         'protocol/chromium_socket_factory_unittest.cc',
@@ -310,8 +314,9 @@
         'protocol/clipboard_filter_unittest.cc',
         'protocol/connection_tester.cc',
         'protocol/connection_tester.h',
-        'protocol/connection_to_client_unittest.cc',
+        'protocol/connection_unittest.cc',
         'protocol/content_description_unittest.cc',
+        'protocol/ice_transport_unittest.cc',
         'protocol/input_event_tracker_unittest.cc',
         'protocol/input_filter_unittest.cc',
         'protocol/jingle_messages_unittest.cc',
@@ -320,15 +325,17 @@
         'protocol/message_reader_unittest.cc',
         'protocol/monitored_video_stub_unittest.cc',
         'protocol/mouse_input_filter_unittest.cc',
-        'protocol/quic_channel_factory_unittest.cc',
         'protocol/negotiating_authenticator_unittest.cc',
         'protocol/pairing_registry_unittest.cc',
         'protocol/port_range_unittest.cc',
         'protocol/ppapi_module_stub.cc',
         'protocol/pseudotcp_adapter_unittest.cc',
+        'protocol/session_config_unittest.cc',
         'protocol/ssl_hmac_channel_authenticator_unittest.cc',
         'protocol/third_party_authenticator_unittest.cc',
         'protocol/v2_authenticator_unittest.cc',
+        'protocol/video_frame_pump_unittest.cc',
+        'protocol/webrtc_transport_unittest.cc',
         'signaling/iq_sender_unittest.cc',
         'signaling/jid_util_unittest.cc',
         'signaling/log_to_server_unittest.cc',
@@ -336,8 +343,8 @@
         'signaling/server_log_entry_unittest.cc',
         'signaling/server_log_entry_unittest.h',
         'signaling/xmpp_login_handler_unittest.cc',
-        'signaling/xmpp_stream_parser_unittest.cc',
         'signaling/xmpp_signal_strategy_unittest.cc',
+        'signaling/xmpp_stream_parser_unittest.cc',
         'test/access_token_fetcher_unittest.cc',
         'test/app_remoting_report_issue_request_unittest.cc',
         'test/app_remoting_test_driver_environment_unittest.cc',
diff --git a/chromium/remoting/remoting_webapp_files.gypi b/chromium/remoting/remoting_webapp_files.gypi
index b18e540e986..9e3e1fbfa99 100644
--- a/chromium/remoting/remoting_webapp_files.gypi
+++ b/chromium/remoting/remoting_webapp_files.gypi
@@ -214,10 +214,7 @@
     # Logging and stats JavaScript files.
     'remoting_webapp_shared_js_logging_files': [
       'webapp/base/js/chromoting_event.js',
-      'webapp/base/js/logger.js',
       'webapp/base/js/format_iq.js',
-      'webapp/base/js/log_to_server.js',
-      'webapp/base/js/server_log_entry.js',
       'webapp/base/js/session_logger.js',
       'webapp/base/js/stats_accumulator.js',
     ],
@@ -277,7 +274,6 @@
     # Files for controlling the local machine as a host.
     # Includes both it2me and me2me files.
     'remoting_webapp_js_host_control_files': [
-      'webapp/crd/js/buffered_signal_strategy.js',
       'webapp/crd/js/host_controller.js',
       'webapp/crd/js/host_daemon_facade.js',
       'webapp/crd/js/host_screen.js',
@@ -292,7 +288,6 @@
     # Files for controlling the local it2me host.
     # Included by public_session.html.
     'remoting_webapp_js_it2me_host_control_files': [
-      'webapp/crd/js/buffered_signal_strategy.js',
       'webapp/crd/js/host_screen.js',
       'webapp/crd/js/host_session.js',
       'webapp/crd/js/host_install_dialog.js',