BASELINE: Update Chromium to 47.0.2526.14

Also adding in sources needed for spellchecking.

Change-Id: Idd44170fa1616f26315188970a8d5ba7d472b18a
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

18 files changed, 430 insertions, 386 deletions

diff --git a/chromium/remoting/app_remoting_shared_module.gyp b/chromium/remoting/app_remoting_shared_module.gyp
index 459e610593c..06837b809c1 100644
--- a/chromium/remoting/app_remoting_shared_module.gyp
+++ b/chromium/remoting/app_remoting_shared_module.gyp
@@ -15,8 +15,9 @@
       # GN version: //remoting/webapp:ar_shared_module
       'target_name': 'ar_shared_module',
       'type': 'none',
-
-
+      'dependencies': [
+        'remoting_nacl.gyp:remoting_client_plugin_nacl',
+      ],
       'variables': {
         'app_key': 'Sample_App',
         'app_id': 'ljacajndfccfgnfohlgkdphmbnpkjflk',
@@ -40,176 +41,183 @@
           '<@(ar_all_js_files)',
           '<@(ar_generated_html_files)',
         ],
+        'extra_files': [
+          'webapp/crd/remoting_client_pnacl.nmf.jinja2',
+          '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe',
+        ],
         'output_dir': '<(PRODUCT_DIR)/app_streaming/>(_target_name)',
         'zip_path': '<(PRODUCT_DIR)/app_streaming/>(_target_name).zip',
 
         'ar_shared_module_locales_listfile': '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)_locales.txt',
+        'conditions': [
+          ['buildtype == "Dev"', {
+            'extra_files': [
+              '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe.debug',
+            ],
+          }],
+        ],  # conditions
 
       },
-
-
-    'actions': [
-      {
-        'action_name': 'Build ar_shared_module locales listfile',
-        'inputs': [
-          '<(remoting_localize_path)',
-        ],
-        'outputs': [
-          '<(ar_shared_module_locales_listfile)',
-        ],
-        'action': [
-          'python', '<(remoting_localize_path)',
-          '--locale_output',
-          '"<(webapp_locale_dir)/@{json_suffix}/messages.json"',
-          '--locales_listfile',
-          '<(ar_shared_module_locales_listfile)',
-          '<@(remoting_locales)',
-        ],
-      },
-      {
-        'action_name': 'Build ar_shared_module application stub',
-        'inputs': [
-          '<(DEPTH)/remoting/webapp/build-webapp.py',
-          '<(chrome_version_path)',
-          '<(remoting_version_path)',
-          '<@(ar_shared_module_files)',
-          '<@(remoting_webapp_locale_files)',
-          '<(ar_shared_module_manifest)',
-          '<(ar_shared_module_locales_listfile)',
-        ],
-        'outputs': [
-          '<(output_dir)',
-          '<(zip_path)',
-        ],
-        'action': [
-          'python', '<(DEPTH)/remoting/webapp/build-webapp.py',
-          '<(buildtype)',
-          '<(version_full)',
-          '<(output_dir)',
-          '<(zip_path)',
-          '<(ar_shared_module_manifest)',
-          'shared_module',  # Web app type
-          '<@(ar_shared_module_files)',
-          '--locales_listfile',
-          '<(ar_shared_module_locales_listfile)',
-        ],
-      },
-
-      {
-        'action_name': 'Build ar_shared_module main.html',
-        'inputs': [
-          '<(DEPTH)/remoting/webapp/build-html.py',
-          '<(ar_main_template)',
-          '<@(ar_main_template_files)',
-        ],
-        'outputs': [
-          '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/main.html',
-        ],
-        'action': [
-          'python', '<(DEPTH)/remoting/webapp/build-html.py',
-          '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/main.html',
-          '<(ar_main_template)',
-          '--template-dir',
-          '<(DEPTH)/remoting',
-          '--templates',
-          '<@(ar_main_template_files)',
-          '--js',
-          '<@(ar_main_js_files)',
-        ],
-      },
-      {
-        'action_name': 'Build ar_shared_module ar_background.html',
-        'inputs': [
-          '<(DEPTH)/remoting/webapp/build-html.py',
-          '<(ar_background_template)',
-        ],
-        'outputs': [
-          '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/ar_background.html',
-        ],
-        'action': [
-          'python', '<(DEPTH)/remoting/webapp/build-html.py',
-          '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/ar_background.html',
-          '<(ar_background_template)',
-          '--template-dir',
-          '<(DEPTH)/remoting',
-          '--js',
-          '<@(ar_background_html_js_files)',
-        ],
-      },
-      {
-        'action_name': 'Build ar_shared_module wcs_sandbox.html',
-        'inputs': [
-          '<(DEPTH)/remoting/webapp/build-html.py',
-          '<(remoting_webapp_template_wcs_sandbox)',
-        ],
-        'outputs': [
-          '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/wcs_sandbox.html',
-        ],
-        'action': [
-          'python', '<(DEPTH)/remoting/webapp/build-html.py',
-          '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/wcs_sandbox.html',
-          '<(remoting_webapp_template_wcs_sandbox)',
-          '--js',
-          '<@(remoting_webapp_wcs_sandbox_html_all_js_files)',
-        ],
-      },
-      {
-        'action_name': 'Build ar_shared_module loading_window.html',
-        'inputs': [
-          '<(DEPTH)/remoting/webapp/build-html.py',
-          '<(ar_loading_window_template)',
-        ],
-        'outputs': [
-          '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/loading_window.html',
-        ],
-        'action': [
-          'python', '<(DEPTH)/remoting/webapp/build-html.py',
-          '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/loading_window.html',
-          '<(ar_loading_window_template)',
-          # The loading window is just a reskin of the message window--all
-          # JS code is shared.
-          '--js', '<@(remoting_webapp_message_window_html_all_js_files)',
-        ],
-      },
-      {
-        'action_name': 'Build ar_shared_module message_window.html',
-        'inputs': [
-          '<(DEPTH)/remoting/webapp/build-html.py',
-          '<(remoting_webapp_template_message_window)',
-        ],
-        'outputs': [
-          '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/message_window.html',
-        ],
-        'action': [
-          'python', '<(DEPTH)/remoting/webapp/build-html.py',
-          '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/message_window.html',
-          '<(remoting_webapp_template_message_window)',
-          '--js', '<@(remoting_webapp_message_window_html_all_js_files)',
-        ],
-      },
-      {
-        'action_name': 'Build ar_shared_module feedback_consent.html',
-        'inputs': [
-          '<(DEPTH)/remoting/webapp/build-html.py',
-          '<(ar_feedback_consent_template)',
-        ],
-        'outputs': [
-          '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/feedback_consent.html',
-        ],
-        'action': [
-          'python', '<(DEPTH)/remoting/webapp/build-html.py',
-          '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/feedback_consent.html',
-          '<(ar_feedback_consent_template)',
-          '--template-dir',
-          '<(DEPTH)/remoting',
-          '--js',
-          '<@(ar_feedback_consent_html_all_js_files)',
-        ],
-      },
-    ],  # actions
-
-
+      'actions': [
+        {
+          'action_name': 'Build ar_shared_module locales listfile',
+          'inputs': [
+            '<(remoting_localize_path)',
+          ],
+          'outputs': [
+            '<(ar_shared_module_locales_listfile)',
+          ],
+          'action': [
+            'python', '<(remoting_localize_path)',
+            '--locale_output',
+            '"<(webapp_locale_dir)/@{json_suffix}/messages.json"',
+            '--locales_listfile',
+            '<(ar_shared_module_locales_listfile)',
+            '<@(remoting_locales)',
+          ],
+        },
+        {
+          'action_name': 'Build ar_shared_module application stub',
+          'inputs': [
+            '<(DEPTH)/remoting/webapp/build-webapp.py',
+            '<(chrome_version_path)',
+            '<(remoting_version_path)',
+            '<@(ar_shared_module_files)',
+            '<@(remoting_webapp_locale_files)',
+            '<(ar_shared_module_manifest)',
+            '<(ar_shared_module_locales_listfile)',
+            '<@(extra_files)',
+          ],
+          'outputs': [
+            '<(output_dir)',
+            '<(zip_path)',
+          ],
+          'action': [
+            'python', '<(DEPTH)/remoting/webapp/build-webapp.py',
+            '<(buildtype)',
+            '<(version_full)',
+            '<(output_dir)',
+            '<(zip_path)',
+            '<(ar_shared_module_manifest)',
+            'shared_module',  # Web app type
+            '<@(ar_shared_module_files)',
+            '<@(extra_files)',
+            '--locales_listfile',
+            '<(ar_shared_module_locales_listfile)',
+          ],
+        },
+        {
+          'action_name': 'Build ar_shared_module main.html',
+          'inputs': [
+            '<(DEPTH)/remoting/webapp/build-html.py',
+            '<(ar_main_template)',
+            '<@(ar_main_template_files)',
+          ],
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/main.html',
+          ],
+          'action': [
+            'python', '<(DEPTH)/remoting/webapp/build-html.py',
+            '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/main.html',
+            '<(ar_main_template)',
+            '--template-dir',
+            '<(DEPTH)/remoting',
+            '--templates',
+            '<@(ar_main_template_files)',
+            '--js',
+            '<@(ar_main_js_files)',
+          ],
+        },
+        {
+          'action_name': 'Build ar_shared_module ar_background.html',
+          'inputs': [
+            '<(DEPTH)/remoting/webapp/build-html.py',
+            '<(ar_background_template)',
+          ],
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/ar_background.html',
+          ],
+          'action': [
+            'python', '<(DEPTH)/remoting/webapp/build-html.py',
+            '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/ar_background.html',
+            '<(ar_background_template)',
+            '--template-dir',
+            '<(DEPTH)/remoting',
+            '--js',
+            '<@(ar_background_html_js_files)',
+          ],
+        },
+        {
+          'action_name': 'Build ar_shared_module wcs_sandbox.html',
+          'inputs': [
+            '<(DEPTH)/remoting/webapp/build-html.py',
+            '<(remoting_webapp_template_wcs_sandbox)',
+          ],
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/wcs_sandbox.html',
+          ],
+          'action': [
+            'python', '<(DEPTH)/remoting/webapp/build-html.py',
+            '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/wcs_sandbox.html',
+            '<(remoting_webapp_template_wcs_sandbox)',
+            '--js',
+            '<@(remoting_webapp_wcs_sandbox_html_all_js_files)',
+          ],
+        },
+        {
+          'action_name': 'Build ar_shared_module loading_window.html',
+          'inputs': [
+            '<(DEPTH)/remoting/webapp/build-html.py',
+            '<(ar_loading_window_template)',
+          ],
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/loading_window.html',
+          ],
+          'action': [
+            'python', '<(DEPTH)/remoting/webapp/build-html.py',
+            '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/loading_window.html',
+            '<(ar_loading_window_template)',
+            # The loading window is just a reskin of the message window--all
+            # JS code is shared.
+            '--js', '<@(remoting_webapp_message_window_html_all_js_files)',
+          ],
+        },
+        {
+          'action_name': 'Build ar_shared_module message_window.html',
+          'inputs': [
+            '<(DEPTH)/remoting/webapp/build-html.py',
+            '<(remoting_webapp_template_message_window)',
+          ],
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/message_window.html',
+          ],
+          'action': [
+            'python', '<(DEPTH)/remoting/webapp/build-html.py',
+            '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/message_window.html',
+            '<(remoting_webapp_template_message_window)',
+            '--js', '<@(remoting_webapp_message_window_html_all_js_files)',
+          ],
+        },
+        {
+          'action_name': 'Build ar_shared_module feedback_consent.html',
+          'inputs': [
+            '<(DEPTH)/remoting/webapp/build-html.py',
+            '<(ar_feedback_consent_template)',
+          ],
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/feedback_consent.html',
+          ],
+          'action': [
+            'python', '<(DEPTH)/remoting/webapp/build-html.py',
+            '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)/feedback_consent.html',
+            '<(ar_feedback_consent_template)',
+            '--template-dir',
+            '<(DEPTH)/remoting',
+            '--js',
+            '<@(ar_feedback_consent_html_all_js_files)',
+          ],
+        },
+      ],  # actions
     },  # end of ar_shared_module
-
   ],  # end of targets
 }
diff --git a/chromium/remoting/app_remoting_webapp.gyp b/chromium/remoting/app_remoting_webapp.gyp
index 8abad758862..d05bd09118b 100644
--- a/chromium/remoting/app_remoting_webapp.gyp
+++ b/chromium/remoting/app_remoting_webapp.gyp
@@ -35,7 +35,7 @@
       'app_client_id': 'sample_client_id',
       'app_name': 'App Remoting Client',
       'app_description': 'App Remoting client',
-      'app_capabilities': ['GOOGLE_DRIVE'],
+      'app_capabilities': ['GOOGLE_DRIVE', 'CLOUD_PRINT'],
       'manifest_key': 'remotingdevbuild',
     },
   ],  # end of targets
diff --git a/chromium/remoting/app_remoting_webapp_files.gypi b/chromium/remoting/app_remoting_webapp_files.gypi
index a4a25e7feaf..7454ab84656 100644
--- a/chromium/remoting/app_remoting_webapp_files.gypi
+++ b/chromium/remoting/app_remoting_webapp_files.gypi
@@ -10,6 +10,7 @@
       'webapp/app_remoting/html/feedback_consent.css',
       'webapp/app_remoting/html/loading_window.css',
       'webapp/app_remoting/html/context_menu.css',
+      'webapp/app_remoting/html/cloud_print_dialog.css',
       'resources/drag.webp',
       '<@(remoting_webapp_resource_files)',
     ],
@@ -57,6 +58,7 @@
       'webapp/app_remoting/js/app_remoting.js',
       'webapp/app_remoting/js/app_remoting_activity.js',
       'webapp/app_remoting/js/ar_auth_dialog.js',
+      'webapp/app_remoting/js/cloud_print_dialog_container.js',
       'webapp/app_remoting/js/context_menu_adapter.js',
       'webapp/app_remoting/js/context_menu_chrome.js',
       'webapp/app_remoting/js/context_menu_dom.js',
@@ -79,6 +81,11 @@
       '<@(remoting_webapp_shared_js_ui_files)',
     ],
 
+    # The JavaScript files to be injected into the clould print dialog.
+    'ar_cloud_print_dialog_js_files': [
+      'webapp/app_remoting/js/cloud_print_dialog/cloud_print_dialog_injected.js',
+    ],
+
     # Variables for ar_background.html.
     'ar_background_template':
       '<(DEPTH)/remoting/webapp/app_remoting/html/template_background.html',
@@ -99,6 +106,7 @@
 
     'ar_all_js_files': [
       '<@(ar_main_js_files)',
+      '<@(ar_cloud_print_dialog_js_files)',
       '<@(ar_feedback_consent_html_js_files)',
       '<@(remoting_webapp_message_window_html_js_files)',
       '<@(remoting_webapp_wcs_sandbox_html_js_files)',
diff --git a/chromium/remoting/compile_js.gypi b/chromium/remoting/compile_js.gypi
index 03279939cf1..340e01a390f 100644
--- a/chromium/remoting/compile_js.gypi
+++ b/chromium/remoting/compile_js.gypi
@@ -4,7 +4,8 @@
 
 {
   'variables': {
-    'externs': ['../third_party/closure_compiler/externs/chrome_extensions.js'],
+    'externs': ['../third_party/closure_compiler/externs/chrome_extensions.js',
+      '../third_party/closure_compiler/externs/metrics_private.js'],
     'script_args': ['--no-single-file'],
     'closure_args': [
       'jscomp_error=reportUnknownTypes',
diff --git a/chromium/remoting/remoting.gyp b/chromium/remoting/remoting.gyp
index d4f1764c4e7..7d7b992b52e 100644
--- a/chromium/remoting/remoting.gyp
+++ b/chromium/remoting/remoting.gyp
@@ -121,12 +121,12 @@
       'variables': {
         'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)',
         'sources': [
-          'base/resources_unittest.cc',
           'host/continue_window_mac.mm',
           'host/disconnect_window_mac.mm',
           'host/installer/mac/uninstaller/remoting_uninstaller-InfoPlist.strings.jinja2',
           'host/it2me/it2me_confirmation_dialog_chromeos.cc',
           'host/mac/me2me_preference_pane-InfoPlist.strings.jinja2',
+          'host/resources_unittest.cc',
           'host/win/core.rc.jinja2',
           'host/win/host_messages.mc.jinja2',
           'host/win/version.rc.jinja2',
@@ -199,7 +199,7 @@
         '../media/media.gyp:media',
         '../media/media.gyp:shared_memory_support',
         '../net/net.gyp:net',
-        '../third_party/libvpx/libvpx.gyp:libvpx',
+        '../third_party/libvpx_new/libvpx.gyp:libvpx_new',
         '../third_party/libyuv/libyuv.gyp:libyuv',
         '../third_party/opus/opus.gyp:opus',
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
@@ -234,7 +234,6 @@
         '../base/base.gyp:base',
         '../crypto/crypto.gyp:crypto',
         '../jingle/jingle.gyp:jingle_glue',
-        '../jingle/jingle.gyp:notifier',
         '../net/net.gyp:net',
         '../third_party/expat/expat.gyp:expat',
         '../third_party/libjingle/libjingle.gyp:libjingle',
@@ -245,6 +244,7 @@
       ],
       'sources': [
         '<@(remoting_protocol_sources)',
+        '<@(remoting_signaling_sources)',
       ],
     },  # end of target 'remoting_protocol'
   ],  # end of targets
diff --git a/chromium/remoting/remoting_all.gyp b/chromium/remoting/remoting_all.gyp
index 70adde6472d..ee135c0aa5d 100644
--- a/chromium/remoting/remoting_all.gyp
+++ b/chromium/remoting/remoting_all.gyp
@@ -13,18 +13,16 @@
       'type': 'none',
       'dependencies': [
         '../remoting/app_remoting_webapp.gyp:ar_sample_app',
-        '../remoting/app_remoting_shared_module.gyp:ar_shared_module',
         '../remoting/remoting.gyp:ar_sample_test_driver',
         '../remoting/remoting.gyp:chromoting_test_driver',
         '../remoting/remoting.gyp:remoting_base',
         '../remoting/remoting.gyp:remoting_breakpad',
         '../remoting/remoting.gyp:remoting_browser_test_resources',
         '../remoting/remoting.gyp:remoting_client',
-        '../remoting/remoting.gyp:remoting_client_plugin',
         '../remoting/remoting.gyp:remoting_protocol',
-        '../remoting/remoting.gyp:remoting_test_common',
-        '../remoting/remoting.gyp:remoting_unittests',
         '../remoting/remoting.gyp:remoting_resources',
+        '../remoting/remoting.gyp:remoting_test_support',
+        '../remoting/remoting.gyp:remoting_unittests',
         '../remoting/remoting.gyp:remoting_webapp',
         '../remoting/remoting.gyp:remoting_webapp_html',
         '../remoting/remoting.gyp:remoting_webapp_unittests',
@@ -79,6 +77,7 @@
           'dependencies': [
              '../remoting/remoting.gyp:remoting_key_tester',
              '../remoting/remoting.gyp:remoting_webapp_browser_test',
+             '../remoting/app_remoting_shared_module.gyp:ar_shared_module',
           ],
         }],
       ],
diff --git a/chromium/remoting/remoting_android.gypi b/chromium/remoting/remoting_android.gypi
index 5894e92f578..14ce25fb49e 100644
--- a/chromium/remoting/remoting_android.gypi
+++ b/chromium/remoting/remoting_android.gypi
@@ -5,11 +5,23 @@
 {
   'conditions': [
     ['OS=="android"', {
+      'variables': {
+        # These hooks allow official builds to modify the remoting_apk target:
+        # Official build of remoting_apk pulls in extra code.
+        'remoting_apk_extra_dependencies%': [],
+        # A different ProGuard config for Google Play Services is needed since the one used by
+        # Chromium and Google Chrome strips out code that we need.
+        'remoting_android_google_play_services_javalib%': '../third_party/android_tools/android_tools.gyp:google_play_services_javalib',
+        # Allows official builds to define the ApplicationContext class differently, and provide
+        # different implementations of parts of the product.
+        'remoting_apk_java_in_dir%': 'android/apk',
+      },
       'targets': [
         {
           'target_name': 'remoting_jni_headers',
           'type': 'none',
           'sources': [
+            'android/java/src/org/chromium/chromoting/jni/Client.java',
             'android/java/src/org/chromium/chromoting/jni/JniInterface.java',
           ],
           'variables': {
@@ -26,6 +38,7 @@
             'remoting_jni_headers',
             'remoting_protocol',
             '../google_apis/google_apis.gyp:google_apis',
+            '../ui/events/events.gyp:dom_keycode_converter',
             '../ui/gfx/gfx.gyp:gfx',
           ],
           'sources': [
@@ -33,11 +46,15 @@
             'client/jni/android_keymap.h',
             'client/jni/chromoting_jni_instance.cc',
             'client/jni/chromoting_jni_instance.h',
-            'client/jni/chromoting_jni_onload.cc',
             'client/jni/chromoting_jni_runtime.cc',
             'client/jni/chromoting_jni_runtime.h',
+            'client/jni/jni_client.cc',
+            'client/jni/jni_client.h',
             'client/jni/jni_frame_consumer.cc',
             'client/jni/jni_frame_consumer.h',
+            'client/jni/remoting_jni_onload.cc',
+            'client/jni/remoting_jni_registrar.cc',
+            'client/jni/remoting_jni_registrar.h',
           ],
         },  # end of target 'remoting_client_jni'
         {
@@ -79,6 +96,7 @@
               '--variables', '<(branding_path)',
               '--template', '<(RULE_INPUT_PATH)',
               '--locale_output', '<@(_outputs)',
+              '--define', 'ENABLE_CARDBOARD=<(enable_cardboard)',
               'en',
             ],
           }],
@@ -103,7 +121,8 @@
             '../third_party/android_tools/android_tools.gyp:android_support_v7_appcompat_javalib',
             '../third_party/android_tools/android_tools.gyp:android_support_v7_mediarouter_javalib',
             '../third_party/android_tools/android_tools.gyp:android_support_v13_javalib',
-            '../third_party/android_tools/android_tools.gyp:google_play_services_javalib',
+            '../third_party/cardboard-java/cardboard.gyp:cardboard_jar',
+            '<(remoting_android_google_play_services_javalib)',
           ],
           'includes': [ '../build/java.gypi' ],
           'conditions' : [
@@ -123,13 +142,14 @@
             'remoting_apk_manifest',
             'remoting_client_jni',
             'remoting_android_client_java',
+            '<@(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))',
             'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/remoting/android/AndroidManifest.xml',
-            'java_in_dir': 'android/apk',
+            'java_in_dir': '<(remoting_apk_java_in_dir)',
             'native_lib_target': 'libremoting_client_jni',
           },
           'includes': [ '../build/java_apk.gypi' ],
diff --git a/chromium/remoting/remoting_client.gypi b/chromium/remoting/remoting_client.gypi
index 3d53e39c466..891b625b222 100644
--- a/chromium/remoting/remoting_client.gypi
+++ b/chromium/remoting/remoting_client.gypi
@@ -5,31 +5,6 @@
 {
   'targets': [
     {
-      # GN version: //remoting/client/plugin
-      'target_name': 'remoting_client_plugin',
-      'type': 'static_library',
-      'variables': { 'enable_wexit_time_destructors': 1, },
-      'defines': [
-        'HAVE_STDINT_H',  # Required by on2_integer.h
-      ],
-      'dependencies': [
-        '../net/net.gyp:net',
-        '../ppapi/ppapi.gyp:ppapi_cpp_objects',
-        '../ppapi/ppapi.gyp:ppapi_internal_module',
-        '../third_party/webrtc/modules/modules.gyp:desktop_capture',
-        '../ui/events/events.gyp:dom_keycode_converter',
-        'remoting_base',
-        'remoting_client',
-        'remoting_protocol',
-      ],
-      'sources': [
-        '<@(remoting_client_plugin_sources)',
-        'client/plugin/pepper_entrypoints.cc',
-        'client/plugin/pepper_entrypoints.h',
-      ],
-    },  # end of target 'remoting_client_plugin'
-
-    {
       # GN version: //remoting/client
       'target_name': 'remoting_client',
       'type': 'static_library',
@@ -121,6 +96,25 @@
             '--js', '<@(remoting_webapp_message_window_html_all_js_files)',
           ],
         },
+        {
+          'action_name': 'Build Remoting Webapp public_session.html',
+          'inputs': [
+            'webapp/build-html.py',
+            '<(remoting_webapp_template_public_session)',
+          ],
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/remoting/public_session.html',
+          ],
+          'action': [
+            'python', 'webapp/build-html.py',
+            '<(SHARED_INTERMEDIATE_DIR)/remoting/public_session.html',
+            '<(remoting_webapp_template_public_session)',
+            '--template-dir', '<(DEPTH)/remoting',
+            '--templates', '<@(remoting_webapp_public_session_template_files)',
+            '--js',
+            '<@(remoting_webapp_public_session_html_all_js_files)',
+          ],
+        },
       ],  # end of actions
     },  # end of target 'remoting_webapp_html'
 
@@ -152,66 +146,37 @@
       ],
     },
     {
-      # GN version: //remoting/webapp:webapp
+      # GN version: //remoting/webapp
       'target_name': 'remoting_webapp',
       'type': 'none',
-      'dependencies': [
-        'remoting_client_credits',
-        'remoting_webapp_v1',
-      ],
-      'conditions': [
-        ['disable_nacl==0 and disable_nacl_untrusted==0', {
-          'dependencies': [
-            'remoting_webapp_v2',
-          ],
-        }]
-      ],
-    },  # end of target 'remoting_webapp'
-
-    {
-      # GN version: //remoting/webapp:webapp_v1
-      'target_name': 'remoting_webapp_v1',
-      'type': 'none',
       'variables': {
-        'webapp_type': 'v1',
-        'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp',
-        'zip_path': '<(PRODUCT_DIR)/remoting-webapp.zip',
+        'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.v2',
+        'zip_path': '<(PRODUCT_DIR)/remoting-webapp.v2.zip',
+        'webapp_type': 'desktop',
+        'extra_files': [
+          'webapp/crd/remoting_client_pnacl.nmf.jinja2',
+        ],
       },
-      'includes': [ 'remoting_webapp.gypi', ],
-    },  # end of target 'remoting_webapp_v1'
-  ],  # end of targets
-
-  'conditions': [
-    ['disable_nacl==0 and disable_nacl_untrusted==0', {
-      'targets': [
-        {
-          # GN version: //remoting/webapp:webapp_v1
-          'target_name': 'remoting_webapp_v2',
-          'type': 'none',
+      'conditions': [
+        ['disable_nacl==0 and disable_nacl_untrusted==0', {
           'variables': {
-            'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.v2',
-            'zip_path': '<(PRODUCT_DIR)/remoting-webapp.v2.zip',
-            'webapp_type': 'v2_pnacl',
             'extra_files': [
-              'webapp/crd/remoting_client_pnacl.nmf.jinja2',
               '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe',
             ],
           },
           'dependencies': [
             'remoting_nacl.gyp:remoting_client_plugin_nacl',
           ],
-          'conditions': [
-            ['buildtype == "Dev"', {
-              'variables': {
-                'extra_files': [
-                  '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe.debug',
-                ],
-              },
-            }],
-          ],
-          'includes': [ 'remoting_webapp.gypi', ],
-        },  # end of target 'remoting_webapp_v2'
+        }],
+        ['disable_nacl==0 and disable_nacl_untrusted==0 and buildtype == "Dev"', {
+          'variables': {
+            'extra_files': [
+              '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe.debug',
+            ],
+          },
+        }],
       ],
-    }],
-  ],
+      'includes': [ 'remoting_webapp.gypi', ],
+    },  # end of target 'remoting_webapp'
+  ],  # end of targets
 }
diff --git a/chromium/remoting/remoting_host.gypi b/chromium/remoting/remoting_host.gypi
index ded5f034152..de2a5d96288 100644
--- a/chromium/remoting/remoting_host.gypi
+++ b/chromium/remoting/remoting_host.gypi
@@ -72,7 +72,7 @@
                 ['chromeos==0 and use_ozone==0', {
                   'dependencies': [
                     # use GTK on Linux, even for Aura builds.
-                    '../build/linux/system.gyp:gtk',
+                    '../build/linux/system.gyp:gtk2',
                   ],
                 }]
               ],
@@ -187,6 +187,11 @@
                 '<@(remoting_cast_sources)',
               ],
             }],
+            ['remoting_use_gcd==1', {
+              'defines': [
+                'USE_GCD',
+              ]
+            }],
           ],
         },  # end of target 'remoting_host'
 
@@ -447,6 +452,11 @@
                 'USE_REMOTING_MACOSX_INTERNAL'
               ],
             }],
+            ['remoting_use_gcd==1', {
+              'defines': [
+                'USE_GCD',
+              ]
+            }],
           ],  # end of 'conditions'
         },  # end of target 'remoting_me2me_host_static'
       ]  # end of targets
@@ -664,7 +674,7 @@
                 ['OS=="linux" and chromeos==0 and use_ozone==0', {
                   'dependencies': [
                     # Always use GTK on Linux, even for Aura builds.
-                    '../build/linux/system.gyp:gtk',
+                    '../build/linux/system.gyp:gtk2',
                   ],
                 }],
                 ['OS=="linux" and use_allocator!="none"', {
diff --git a/chromium/remoting/remoting_host_srcs.gypi b/chromium/remoting/remoting_host_srcs.gypi
index 0a6366e6014..363a67d581f 100644
--- a/chromium/remoting/remoting_host_srcs.gypi
+++ b/chromium/remoting/remoting_host_srcs.gypi
@@ -114,6 +114,8 @@
       'host/host_config.cc',
       'host/host_config.h',
       'host/host_config_constants.cc',
+      'host/host_details.cc',
+      'host/host_details.h',
       'host/host_event_logger.h',
       'host/host_event_logger_posix.cc',
       'host/host_event_logger_win.cc',
@@ -205,6 +207,10 @@
       'host/remote_input_filter.h',
       'host/resizing_host_observer.cc',
       'host/resizing_host_observer.h',
+      'host/resources.h',
+      'host/resources_linux.cc',
+      'host/resources_mac.cc',
+      'host/resources_win.cc',
       'host/sas_injector.h',
       'host/sas_injector_win.cc',
       'host/screen_controls.h',
@@ -226,14 +232,16 @@
       'host/single_window_input_injector_linux.cc',
       'host/single_window_input_injector_mac.cc',
       'host/single_window_input_injector_win.cc',
+      'host/switches.cc',
+      'host/switches.h',
       'host/third_party_auth_config.cc',
       'host/third_party_auth_config.h',
       'host/token_validator_base.cc',
       'host/token_validator_base.h',
       'host/token_validator_factory_impl.cc',
       'host/token_validator_factory_impl.h',
-      'host/touch_injector_win.h',
       'host/touch_injector_win.cc',
+      'host/touch_injector_win.h',
       'host/usage_stats_consent.h',
       'host/usage_stats_consent_mac.cc',
       'host/usage_stats_consent_win.cc',
@@ -264,6 +272,8 @@
       'host/win/session_input_injector.h',
       'host/win/window_station_and_desktop.cc',
       'host/win/window_station_and_desktop.h',
+      'host/win/worker_process_launcher.cc',
+      'host/win/worker_process_launcher.h',
       'host/win/wts_terminal_monitor.cc',
       'host/win/wts_terminal_monitor.h',
       'host/win/wts_terminal_observer.h',
@@ -294,6 +304,8 @@
       'host/setup/win/auth_code_getter.h',
     ],
     'remoting_host_native_messaging_sources': [
+      'host/native_messaging/log_message_handler.cc',
+      'host/native_messaging/log_message_handler.h',
       'host/native_messaging/native_messaging_pipe.cc',
       'host/native_messaging/native_messaging_pipe.h',
       'host/native_messaging/native_messaging_reader.cc',
diff --git a/chromium/remoting/remoting_host_win.gypi b/chromium/remoting/remoting_host_win.gypi
index 22830ab0b24..9c0b3e9e07f 100644
--- a/chromium/remoting/remoting_host_win.gypi
+++ b/chromium/remoting/remoting_host_win.gypi
@@ -30,6 +30,12 @@
       # GN version: //remoting/host:remoting_lib_idl
       'target_name': 'remoting_lib_idl',
       'type': 'static_library',
+      'variables': {
+        'clang_warning_flags': [
+          # MIDL generates code like "#endif !_MIDL_USE_GUIDDEF_"
+          '-Wno-extra-tokens',
+        ],
+      },
       'sources': [
         'host/win/chromoting_lib_idl.templ',
         '<(SHARED_INTERMEDIATE_DIR)/remoting/host/chromoting_lib.h',
@@ -96,6 +102,8 @@
           # Source files generated by the MIDL compiler trigger warnings with
           # -Wincompatible-pointer-types enabled.
           '-Wno-incompatible-pointer-types',
+          # Generated code contains unused variables.
+          '-Wno-unused-variable',
         ],
       },
     },  # end of target 'remoting_lib_ps'
@@ -224,8 +232,6 @@
         'host/win/rdp_desktop_session.h',
         'host/win/unprivileged_process_delegate.cc',
         'host/win/unprivileged_process_delegate.h',
-        'host/win/worker_process_launcher.cc',
-        'host/win/worker_process_launcher.h',
         'host/win/wts_session_process_delegate.cc',
         'host/win/wts_session_process_delegate.h',
         'host/worker_process_ipc_delegate.h',
diff --git a/chromium/remoting/remoting_nacl.gyp b/chromium/remoting/remoting_nacl.gyp
index 1e29858b480..6604231f2d3 100644
--- a/chromium/remoting/remoting_nacl.gyp
+++ b/chromium/remoting/remoting_nacl.gyp
@@ -106,7 +106,7 @@
         '../third_party/expat/expat_nacl.gyp:expat_nacl',
         '../third_party/khronos/khronos.gyp:khronos_headers',
         '../third_party/libjingle/libjingle_nacl.gyp:libjingle_nacl',
-        '../third_party/libvpx/libvpx_nacl.gyp:libvpx_nacl',
+        '../third_party/libvpx_new/libvpx_nacl.gyp:libvpx_nacl',
         '../third_party/libyuv/libyuv_nacl.gyp:libyuv_nacl',
         '../third_party/opus/opus_nacl.gyp:opus_nacl',
         'remoting_proto_nacl',
@@ -119,6 +119,7 @@
         '<@(remoting_client_plugin_sources)',
         '<@(remoting_client_sources)',
         '<@(remoting_protocol_sources)',
+        '<@(remoting_signaling_sources)',
       ],
       'sources!': [
         'base/url_request_context_getter.cc',
@@ -131,7 +132,7 @@
       'target_conditions': [
         ['1==1', {
           'sources/': [
-            [ 'include', 'client/plugin/normalizing_input_filter_mac.cc' ],
+            [ 'include', 'client/normalizing_input_filter_mac.cc' ],
           ],
         }],
       ],
@@ -156,7 +157,6 @@
           '>(tc_lib_dir_pnacl_newlib)/libicuuc_nacl.a',
           '>(tc_lib_dir_pnacl_newlib)/libjingle_nacl.a',
           '>(tc_lib_dir_pnacl_newlib)/libjingle_p2p_constants_nacl.a',
-          '>(tc_lib_dir_pnacl_newlib)/libmedia_yuv_nacl.a',
           '>(tc_lib_dir_pnacl_newlib)/libmodp_b64_nacl.a',
           '>(tc_lib_dir_pnacl_newlib)/libboringssl_nacl.a',
           '>(tc_lib_dir_pnacl_newlib)/libopus_nacl.a',
@@ -178,7 +178,6 @@
         '../base/base_nacl.gyp:base_nacl',
         '../crypto/crypto_nacl.gyp:crypto_nacl',
         '../jingle/jingle_nacl.gyp:jingle_glue_nacl',
-        '../media/media_nacl.gyp:media_yuv_nacl',
         '../native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted',
         '../net/net_nacl.gyp:net_nacl',
         '../ppapi/native_client/native_client.gyp:ppapi_lib',
@@ -205,7 +204,6 @@
 
         # Chromium libraries.
         '-ljingle_glue_nacl',
-        '-lmedia_yuv_nacl',
         '-lnet_nacl',
         '-lcrypto_nacl',
         '-lbase_i18n_nacl',
diff --git a/chromium/remoting/remoting_options.gypi b/chromium/remoting/remoting_options.gypi
index 037fddc9fef..0181d7916bb 100644
--- a/chromium/remoting/remoting_options.gypi
+++ b/chromium/remoting/remoting_options.gypi
@@ -15,6 +15,9 @@
     # Set this to use GCD instead of the remoting directory service.
     'remoting_use_gcd%': 0,
 
+    # Set this to enable Android Chromoting Cardboard Activity.
+    'enable_cardboard%': 0,
+
     'variables': {
       'conditions': [
         # Enable the multi-process host on Windows by default.
@@ -33,7 +36,7 @@
 
     # The ar_service_environment variable is used to define the target
     # environment for the app being built.
-    # The allowed values are dev, test, staging, prod, and prod-testing.
+    # The allowed values are dev and prod.
     'conditions': [
       ['buildtype == "Dev"', {
         'ar_service_environment%': 'dev',
diff --git a/chromium/remoting/remoting_srcs.gypi b/chromium/remoting/remoting_srcs.gypi
index 968ab1bf992..dc5d7c74fe4 100644
--- a/chromium/remoting/remoting_srcs.gypi
+++ b/chromium/remoting/remoting_srcs.gypi
@@ -23,10 +23,6 @@
       'base/plugin_thread_task_runner.h',
       'base/rate_counter.cc',
       'base/rate_counter.h',
-      'base/resources.h',
-      'base/resources_linux.cc',
-      'base/resources_mac.cc',
-      'base/resources_win.cc',
       'base/rsa_key_pair.cc',
       'base/rsa_key_pair.h',
       'base/running_average.cc',
@@ -118,6 +114,7 @@
       'protocol/content_description.cc',
       'protocol/content_description.h',
       'protocol/datagram_channel_factory.h',
+      'protocol/errors.cc',
       'protocol/errors.h',
       'protocol/host_control_dispatcher.cc',
       'protocol/host_control_dispatcher.h',
@@ -161,6 +158,8 @@
       'protocol/negotiating_host_authenticator.cc',
       'protocol/negotiating_host_authenticator.h',
       'protocol/network_settings.h',
+      'protocol/p2p_datagram_socket.h',
+      'protocol/p2p_stream_socket.h',
       'protocol/pairing_authenticator_base.cc',
       'protocol/pairing_authenticator_base.h',
       'protocol/pairing_client_authenticator.cc',
@@ -169,12 +168,18 @@
       'protocol/pairing_host_authenticator.h',
       'protocol/pairing_registry.cc',
       'protocol/pairing_registry.h',
+      'protocol/performance_tracker.cc',
+      'protocol/performance_tracker.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',
@@ -199,6 +204,9 @@
       'protocol/v2_authenticator.cc',
       'protocol/v2_authenticator.h',
       'protocol/video_stub.h',
+    ],
+
+    'remoting_signaling_sources': [
       'signaling/iq_sender.cc',
       'signaling/iq_sender.h',
       'signaling/jid_util.cc',
@@ -227,25 +235,28 @@
       'client/audio_player.h',
       'client/chromoting_client.cc',
       'client/chromoting_client.h',
-      'client/chromoting_stats.cc',
-      'client/chromoting_stats.h',
       'client/client_context.cc',
       'client/client_context.h',
       'client/client_status_logger.cc',
       'client/client_status_logger.h',
       'client/client_user_interface.h',
+      'client/empty_cursor_filter.cc',
+      'client/empty_cursor_filter.h',
       'client/frame_consumer.h',
-      'client/frame_consumer_proxy.cc',
-      'client/frame_consumer_proxy.h',
-      'client/frame_producer.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/server_log_entry_client.cc',
       'client/server_log_entry_client.h',
       'client/software_video_renderer.cc',
       'client/software_video_renderer.h',
       'client/token_fetcher_proxy.cc',
       'client/token_fetcher_proxy.h',
+      'client/touch_input_scaler.cc',
+      'client/touch_input_scaler.h',
       'client/video_renderer.h',
     ],
 
@@ -254,12 +265,6 @@
       'client/plugin/chromoting_instance.h',
       'client/plugin/delegating_signal_strategy.cc',
       'client/plugin/delegating_signal_strategy.h',
-      'client/plugin/empty_cursor_filter.cc',
-      'client/plugin/empty_cursor_filter.h',
-      'client/plugin/normalizing_input_filter_cros.cc',
-      'client/plugin/normalizing_input_filter_cros.h',
-      'client/plugin/normalizing_input_filter_mac.cc',
-      'client/plugin/normalizing_input_filter_mac.h',
       'client/plugin/pepper_address_resolver.cc',
       'client/plugin/pepper_address_resolver.h',
       'client/plugin/pepper_audio_player.cc',
@@ -268,6 +273,7 @@
       'client/plugin/pepper_cursor_setter.h',
       'client/plugin/pepper_input_handler.cc',
       'client/plugin/pepper_input_handler.h',
+      'client/plugin/pepper_module.cc',
       'client/plugin/pepper_mouse_locker.cc',
       'client/plugin/pepper_mouse_locker.h',
       'client/plugin/pepper_network_manager.cc',
@@ -285,8 +291,6 @@
       'client/plugin/pepper_video_renderer_2d.h',
       'client/plugin/pepper_video_renderer_3d.cc',
       'client/plugin/pepper_video_renderer_3d.h',
-      'client/plugin/touch_input_scaler.cc',
-      'client/plugin/touch_input_scaler.h',
     ],
   }
 }
diff --git a/chromium/remoting/remoting_test.gypi b/chromium/remoting/remoting_test.gypi
index 73a9f17448e..996760c4a1f 100644
--- a/chromium/remoting/remoting_test.gypi
+++ b/chromium/remoting/remoting_test.gypi
@@ -6,11 +6,10 @@
   'targets': [
     {
       # GN version: //remoting:test_support
-      'target_name': 'remoting_test_common',
+      'target_name': 'remoting_test_support',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
-        '../components/components.gyp:policy_component_test_support',
         '../net/net.gyp:net_test_support',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
@@ -26,9 +25,13 @@
         'host/fake_desktop_capturer.h',
         'host/fake_desktop_environment.cc',
         'host/fake_desktop_environment.h',
+        'host/fake_host_extension.cc',
+        'host/fake_host_extension.h',
         'host/fake_host_status_monitor.h',
         'host/fake_mouse_cursor_monitor.cc',
         'host/fake_mouse_cursor_monitor.h',
+        'host/fake_oauth_token_getter.cc',
+        'host/fake_oauth_token_getter.h',
         'protocol/fake_authenticator.cc',
         'protocol/fake_authenticator.h',
         'protocol/fake_connection_to_host.cc',
@@ -52,27 +55,34 @@
         'test/app_remoting_report_issue_request.h',
         'test/app_remoting_service_urls.cc',
         'test/app_remoting_service_urls.h',
-        'test/app_remoting_test_driver_environment.cc',
-        'test/app_remoting_test_driver_environment_app_details.cc',
-        'test/app_remoting_test_driver_environment.h',
-        'test/host_info.cc',
-        'test/host_info.h',
-        'test/host_list_fetcher.cc',
-        'test/host_list_fetcher.h',
+        'test/chromoting_test_driver_environment.cc',
+        'test/chromoting_test_driver_environment.h',
+        'test/connection_setup_info.cc',
+        'test/connection_setup_info.h',
+        'test/connection_time_observer.cc',
+        'test/connection_time_observer.h',
         'test/fake_access_token_fetcher.cc',
         'test/fake_access_token_fetcher.h',
         'test/fake_app_remoting_report_issue_request.cc',
         'test/fake_app_remoting_report_issue_request.h',
+        'test/fake_host_list_fetcher.cc',
+        'test/fake_host_list_fetcher.h',
         'test/fake_network_dispatcher.cc',
         'test/fake_network_dispatcher.h',
         'test/fake_network_manager.cc',
         'test/fake_network_manager.h',
         'test/fake_port_allocator.cc',
         'test/fake_port_allocator.h',
+        'test/fake_refresh_token_store.cc',
+        'test/fake_refresh_token_store.h',
         'test/fake_remote_host_info_fetcher.cc',
         'test/fake_remote_host_info_fetcher.h',
         'test/fake_socket_factory.cc',
         'test/fake_socket_factory.h',
+        'test/host_info.cc',
+        'test/host_info.h',
+        'test/host_list_fetcher.cc',
+        'test/host_list_fetcher.h',
         'test/leaky_bucket.cc',
         'test/leaky_bucket.h',
         'test/mock_access_token_fetcher.cc',
@@ -85,10 +95,14 @@
         'test/remote_host_info.h',
         'test/remote_host_info_fetcher.cc',
         'test/remote_host_info_fetcher.h',
+        'test/rgb_value.cc',
+        'test/rgb_value.h',
         'test/test_chromoting_client.cc',
         'test/test_chromoting_client.h',
         'test/test_video_renderer.cc',
         'test/test_video_renderer.h',
+        'test/video_frame_writer.cc',
+        'test/video_frame_writer.h',
       ],
       'conditions': [
         ['enable_remoting_host == 0', {
@@ -99,55 +113,26 @@
             ['exclude', '^host/'],
           ]
         }],
+        ['configuration_policy == 1', {
+          'dependencies': [
+            '../components/components.gyp:policy_component_test_support',
+          ],
+        }],
       ],
     },
     {
-      'target_name': 'remoting_test_driver_common',
-      'type': 'static_library',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/base.gyp:test_support_base',
-        '../google_apis/google_apis.gyp:google_apis',
-        '../net/net.gyp:net',
-        '../remoting/remoting.gyp:remoting_base',
-        '../remoting/remoting.gyp:remoting_client',
-        '../remoting/remoting.gyp:remoting_protocol',
-        '../testing/gtest.gyp:gtest',
-      ],
-      'defines': [
-        'VERSION=<(version_full)',
-      ],
-      'sources': [
-        'test/access_token_fetcher.cc',
-        'test/access_token_fetcher.h',
-        'test/refresh_token_store.cc',
-        'test/refresh_token_store.h',
-        'test/remote_connection_observer.h',
-        'test/test_chromoting_client.cc',
-        'test/test_chromoting_client.h',
-        'test/test_video_renderer.cc',
-        'test/test_video_renderer.h',
-      ],
-    }, # end of target 'remoting_test_driver_common'
-    {
-      # A chromoting version of remoting_test_driver_common
       'target_name': 'chromoting_test_driver',
       'type': '<(gtest_target_type)',
       'dependencies': [
-        'remoting_test_driver_common',
-      ],
-      'defines': [
-        'VERSION=<(version_full)',
+        '../remoting/proto/chromotocol.gyp:chromotocol_proto_lib',
+        '../testing/gtest.gyp:gtest',
+        'remoting_test_support',
       ],
       'sources': [
-        'test/host_info.cc',
-        'test/host_info.h',
-        'test/host_list_fetcher.cc',
-        'test/host_list_fetcher.h',
         'test/chromoting_test_driver.cc',
-      ],
-      'include_dirs': [
-        '../testing/gtest/include',
+        'test/chromoting_test_driver_tests.cc',
+        'test/chromoting_test_fixture.cc',
+        'test/chromoting_test_fixture.h',
       ],
     }, # end of target 'chromoting_test_driver'
     {
@@ -155,11 +140,9 @@
       'type': 'static_library',
       'dependencies': [
         '../remoting/proto/chromotocol.gyp:chromotocol_proto_lib',
-        '<(DEPTH)/third_party/webrtc/modules/modules.gyp:desktop_capture',
-        'remoting_test_driver_common',
-      ],
-      'defines': [
-        'VERSION=<(version_full)',
+        '../testing/gtest.gyp:gtest',
+        '../third_party/webrtc/modules/modules.gyp:desktop_capture',
+        'remoting_test_support',
       ],
       'sources': [
         'test/app_remoting_connected_client_fixture.cc',
@@ -168,20 +151,8 @@
         'test/app_remoting_connection_helper.h',
         'test/app_remoting_latency_test_fixture.cc',
         'test/app_remoting_latency_test_fixture.h',
-        'test/app_remoting_report_issue_request.cc',
-        'test/app_remoting_report_issue_request.h',
-        'test/app_remoting_service_urls.cc',
-        'test/app_remoting_service_urls.h',
         'test/app_remoting_test_driver_environment.cc',
         'test/app_remoting_test_driver_environment.h',
-        'test/remote_application_details.h',
-        'test/remote_host_info.cc',
-        'test/remote_host_info.h',
-        'test/remote_host_info_fetcher.cc',
-        'test/remote_host_info_fetcher.h',
-      ],
-      'include_dirs': [
-        '../testing/gtest/include',
       ],
     },  # end of target 'ar_test_driver_common'
     {
@@ -190,16 +161,11 @@
       'type': '<(gtest_target_type)',
       'dependencies': [
         'ar_test_driver_common',
-      ],
-      'defines': [
-        'VERSION=<(version_full)',
+        '../testing/gtest.gyp:gtest',
       ],
       'sources': [
         'test/app_remoting_test_driver.cc',
-        'test/app_remoting_test_driver_environment_app_details.cc',
-      ],
-      'include_dirs': [
-        '../testing/gtest/include',
+        'test/app_remoting_sample_test_driver_environment.cc',
       ],
     },  # end of target 'ar_sample_test_driver'
 
@@ -214,7 +180,6 @@
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
-        '../components/components.gyp:policy',
         '../ipc/ipc.gyp:ipc',
         '../net/net.gyp:net_test_support',
         '../ppapi/ppapi.gyp:ppapi_cpp',
@@ -225,17 +190,17 @@
         '../ui/base/ui_base.gyp:ui_base',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
+        'ar_test_driver_common',
         'remoting_base',
         'remoting_breakpad',
         'remoting_client',
-        'remoting_client_plugin',
         'remoting_host',
         'remoting_host_setup_base',
         'remoting_it2me_host_static',
         'remoting_native_messaging_base',
         'remoting_protocol',
         'remoting_resources',
-        'remoting_test_common',
+        'remoting_test_support',
       ],
       'defines': [
         'VERSION=<(version_full)',
@@ -252,7 +217,6 @@
         'base/capabilities_unittest.cc',
         'base/compound_buffer_unittest.cc',
         'base/rate_counter_unittest.cc',
-        'base/resources_unittest.cc',
         'base/rsa_key_pair_unittest.cc',
         'base/run_all_unittests.cc',
         'base/running_average_unittest.cc',
@@ -261,12 +225,13 @@
         'base/util_unittest.cc',
         'client/audio_player_unittest.cc',
         'client/client_status_logger_unittest.cc',
+        'client/empty_cursor_filter_unittest.cc',
         'client/key_event_mapper_unittest.cc',
-        'client/plugin/empty_cursor_filter_unittest.cc',
-        'client/plugin/normalizing_input_filter_cros_unittest.cc',
-        'client/plugin/normalizing_input_filter_mac_unittest.cc',
-        'client/plugin/touch_input_scaler_unittest.cc',
+        'client/normalizing_input_filter_cros_unittest.cc',
+        'client/normalizing_input_filter_mac_unittest.cc',
         'client/server_log_entry_client_unittest.cc',
+        'client/software_video_renderer_unittest.cc',
+        'client/touch_input_scaler_unittest.cc',
         'codec/audio_encoder_opus_unittest.cc',
         'codec/codec_test.cc',
         'codec/codec_test.h',
@@ -289,13 +254,6 @@
         'host/daemon_process_unittest.cc',
         'host/desktop_process_unittest.cc',
         'host/desktop_shape_tracker_unittest.cc',
-        'host/fake_desktop_capturer.cc',
-        'host/fake_desktop_capturer.h',
-        'host/fake_host_extension.cc',
-        'host/fake_host_extension.h',
-        'host/fake_host_status_monitor.h',
-        'host/fake_oauth_token_getter.cc',
-        'host/fake_oauth_token_getter.h',
         'host/gcd_rest_client_unittest.cc',
         'host/gcd_state_updater_unittest.cc',
         'host/gnubby_auth_handler_posix_unittest.cc',
@@ -322,10 +280,9 @@
         'host/register_support_host_request_unittest.cc',
         'host/remote_input_filter_unittest.cc',
         'host/resizing_host_observer_unittest.cc',
+        'host/resources_unittest.cc',
         'host/screen_resolution_unittest.cc',
         'host/server_log_entry_host_unittest.cc',
-        'host/setup/mock_oauth_client.cc',
-        'host/setup/mock_oauth_client.h',
         'host/setup/me2me_native_messaging_host.cc',
         'host/setup/me2me_native_messaging_host.h',
         'host/setup/me2me_native_messaging_host_unittest.cc',
@@ -363,6 +320,7 @@
         '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',
@@ -383,6 +341,8 @@
         'test/access_token_fetcher_unittest.cc',
         'test/app_remoting_report_issue_request_unittest.cc',
         'test/app_remoting_test_driver_environment_unittest.cc',
+        'test/chromoting_test_driver_environment_unittest.cc',
+        'test/connection_time_observer_unittest.cc',
         'test/host_list_fetcher_unittest.cc',
         'test/remote_host_info_fetcher_unittest.cc',
         'test/test_chromoting_client_unittest.cc',
@@ -404,21 +364,12 @@
           },
         }],
         [ 'OS=="android"', {
-          'dependencies!': [
-            'remoting_client_plugin',
-          ],
-          'sources/': [
-            ['exclude', '^client/plugin/'],
-          ]
-        }],
-        [ 'OS=="android"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
         }],
         [ 'chromeos==0', {
           'sources!': [
-            'client/plugin/normalizing_input_filter_cros_unittest.cc',
             'host/chromeos/aura_desktop_capturer_unittest.cc',
             'host/clipboard_aura_unittest.cc',
           ],
@@ -443,7 +394,6 @@
           'sources/': [
             ['exclude', '^codec/'],
             ['exclude', '^host/'],
-            ['exclude', '^base/resources_unittest\\.cc$'],
           ]
         }],
         [ 'OS == "linux" and use_allocator!="none"', {
@@ -451,9 +401,15 @@
             '../base/allocator/allocator.gyp:allocator',
           ],
         }],
+        ['configuration_policy == 1', {
+          'dependencies': [
+            '../components/components.gyp:policy',
+          ],
+        }],
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
     {
+      # GN version: //remoting/webapp:browser_test_resources
       'target_name': 'remoting_browser_test_resources',
       'type': 'none',
       'copies': [
@@ -495,6 +451,7 @@
       ],  # end of actions
     },  # end of target 'remoting_webapp_browser_test_html'
     {
+      # GN version: //remoting/webapp:unit_tests
       'target_name': 'remoting_webapp_unittests',
       'type': 'none',
       'variables': {
@@ -507,6 +464,7 @@
       },
       'copies': [
         {
+          # GN version: //remoting/webapp:qunit
           'destination': '<(output_dir)/qunit',
           'files': [
             '../third_party/qunit/src/browser_test_harness.js',
@@ -515,6 +473,7 @@
           ],
         },
         {
+          # GN version: //remoting/webapp:blanketjs
           'destination': '<(output_dir)/blanketjs',
           'files': [
             '../third_party/blanketjs/src/blanket.js',
@@ -522,6 +481,7 @@
           ],
         },
         {
+          # GN version: //remoting/webapp:sinonjs
           'destination': '<(output_dir)/sinonjs',
           'files': [
             '../third_party/sinonjs/src/sinon.js',
@@ -529,6 +489,7 @@
           ],
         },
         {
+          # GN version: //remoting/webapp:js_files
           'destination': '<(output_dir)',
           'files': [
             '<@(webapp_js_files)',
@@ -579,7 +540,7 @@
             '../third_party/webrtc/modules/modules.gyp:desktop_capture',
             '../third_party/libjingle/libjingle.gyp:libjingle',
             'remoting_base',
-            'remoting_test_common',
+            'remoting_test_support',
           ],
           'defines': [
             'VERSION=<(version_full)',
@@ -624,7 +585,7 @@
           'variables': {
             'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.browsertest.v2',
             'zip_path': '<(PRODUCT_DIR)/remoting-webapp.browsertest.v2.zip',
-            'webapp_type': 'v2_pnacl',
+            'webapp_type': 'v2',
             'main_html_file': '<(SHARED_INTERMEDIATE_DIR)/browser_test/main.html',
             'extra_files': [
               'webapp/crd/remoting_client_pnacl.nmf.jinja2',
diff --git a/chromium/remoting/remoting_unittests.isolate b/chromium/remoting/remoting_unittests.isolate
index ed6fca8e444..77f78e42454 100644
--- a/chromium/remoting/remoting_unittests.isolate
+++ b/chromium/remoting/remoting_unittests.isolate
@@ -19,7 +19,6 @@
           '../net/data/ssl/certificates/unittest.key.bin',
           '../net/data/ssl/certificates/unittest.selfsigned.der',
           '../testing/test_env.py',
-          '<(PRODUCT_DIR)/remoting_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/chromium/remoting/remoting_webapp.gypi b/chromium/remoting/remoting_webapp.gypi
index 6151bf28ef5..230f1533c29 100644
--- a/chromium/remoting/remoting_webapp.gypi
+++ b/chromium/remoting/remoting_webapp.gypi
@@ -14,6 +14,7 @@
       '<(SHARED_INTERMEDIATE_DIR)/remoting/credits.html',
       '<(SHARED_INTERMEDIATE_DIR)/remoting/message_window.html',
       '<(SHARED_INTERMEDIATE_DIR)/remoting/wcs_sandbox.html',
+      '<(SHARED_INTERMEDIATE_DIR)/remoting/public_session.html',
     ],
     'dr_webapp_locales_listfile': '<(SHARED_INTERMEDIATE_DIR)/>(_target_name)_locales.txt',
   },
diff --git a/chromium/remoting/remoting_webapp_files.gypi b/chromium/remoting/remoting_webapp_files.gypi
index 3b0cb9f8cf9..b18e540e986 100644
--- a/chromium/remoting/remoting_webapp_files.gypi
+++ b/chromium/remoting/remoting_webapp_files.gypi
@@ -86,14 +86,18 @@
       'webapp/base/js/base_unittest.js',
       'webapp/base/js/base_event_hook_unittest.js',
       'webapp/base/js/base_inherits_unittest.js',
+      'webapp/base/js/callstack_unittest.js',
       'webapp/base/js/client_session_unittest.js',
       'webapp/base/js/client_session_factory_unittest.js',
+      'webapp/base/js/console_wrapper_unittest.js',
       'webapp/base/js/dns_blackhole_checker_unittest.js',
       'webapp/base/js/error_unittest.js',
       'webapp/base/js/fallback_signal_strategy_unittest.js',
+      'webapp/base/js/host_options_unittest.js',
       'webapp/base/js/identity_unittest.js',
       'webapp/base/js/ipc_unittest.js',
       'webapp/base/js/l10n_unittest.js',
+      'webapp/base/js/network_connectivity_detector_unittest.js',
       'webapp/base/js/platform_unittest.js',
       'webapp/base/js/protocol_extension_manager_unittest.js',
       'webapp/base/js/session_logger_unittest.js',
@@ -105,9 +109,11 @@
       'webapp/base/js/xhr_event_writer_unittest.js',
       'webapp/base/js/xhr_unittest.js',
       'webapp/base/js/xmpp_connection_unittest.js',
+      'webapp/base/js/xmpp_error_cache_unittest.js',
       'webapp/base/js/xmpp_login_handler_unittest.js',
       'webapp/base/js/xmpp_stream_parser_unittest.js',
       'webapp/crd/js/apps_v2_migration_unittest.js',
+      'webapp/crd/js/combined_host_list_api_unittest.js',
       'webapp/crd/js/gcd_client_unittest.js',
       'webapp/crd/js/gcd_client_with_mock_xhr_unittest.js',
       'webapp/crd/js/host_controller_unittest.js',
@@ -115,14 +121,17 @@
       'webapp/crd/js/host_table_entry_unittest.js',
       'webapp/crd/js/legacy_host_list_api_unittest.js',
       'webapp/crd/js/menu_button_unittest.js',
+      'webapp/crd/js/me2me_telemetry_integration_test.js',
       'webapp/crd/js/mock_xhr_unittest.js',
     ],
     'remoting_webapp_unittests_js_mock_files': [
       'webapp/crd/js/mock_client_plugin.js',
       'webapp/crd/js/mock_host_daemon_facade.js',
       'webapp/crd/js/mock_host_list_api.js',
+      'webapp/crd/js/mock_modal_dialog_factory.js',
       'webapp/crd/js/mock_identity.js',
       'webapp/crd/js/mock_signal_strategy.js',
+      'webapp/crd/js/remoting_activity_test_driver.js',
       'webapp/js_proto/chrome_mocks.js',
       'webapp/unittests/sinon_helpers.js',
       'webapp/crd/js/mock_xhr.js',
@@ -172,31 +181,35 @@
       'webapp/base/js/connected_view.js',
       'webapp/base/js/connection_info.js',
       'webapp/base/js/credentials_provider.js',
+      'webapp/base/js/experiments.js',
       'webapp/base/js/host_desktop.js',
-      'webapp/base/js/smart_reconnector.js',
       'webapp/base/js/telemetry_event_writer.js',
+      'webapp/base/js/xmpp_error_cache.js',
     ],
     # Remoting core JavaScript files.
     'remoting_webapp_shared_js_core_files': [
       'webapp/base/js/application.js',
       'webapp/base/js/base.js',
+      'webapp/base/js/callstack.js',
+      'webapp/base/js/console_wrapper.js',
       'webapp/base/js/ipc.js',
       'webapp/base/js/modal_dialogs.js',
       'webapp/base/js/platform.js',
       'webapp/base/js/protocol_extension_manager.js',
       'webapp/base/js/protocol_extension.js',
       'webapp/base/js/error.js',
+      'webapp/base/js/network_connectivity_detector.js',
       'webapp/base/js/plugin_settings.js',
       'webapp/base/js/suspend_detector.js',
       'webapp/base/js/typecheck.js',
-      'webapp/base/js/window_message_dispatcher.js',
       'webapp/base/js/xhr_event_writer.js',
+      'webapp/base/js/window_message_dispatcher.js',
       'webapp/base/js/xhr.js',
     ],
     # Host JavaScript files.
     'remoting_webapp_shared_js_host_files': [
       'webapp/base/js/host.js',
-      'webapp/base/js/host_settings.js',
+      'webapp/base/js/host_options.js',
     ],
     # Logging and stats JavaScript files.
     'remoting_webapp_shared_js_logging_files': [
@@ -273,8 +286,20 @@
       'webapp/crd/js/host_install_dialog.js',
       'webapp/crd/js/host_installer.js',
       'webapp/crd/js/it2me_host_facade.js',
+      'webapp/crd/js/native_message_host_log_message_handler.js',
       'webapp/crd/js/paired_client_manager.js',
     ],
+    # 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',
+      'webapp/crd/js/host_installer.js',
+      'webapp/crd/js/it2me_host_facade.js',
+      'webapp/crd/js/native_message_host_log_message_handler.js',
+    ],
     # Files for displaying (in the client) info about available hosts.
     'remoting_webapp_js_host_display_files': [
       'webapp/crd/js/host_list.js',
@@ -286,6 +311,7 @@
       # JSCompiler.  If an implementation of an interface occurs in a
       # file processed before the interface itself, the @override tag
       # doesn't always work correctly.
+      'webapp/crd/js/combined_host_list_api.js',
       'webapp/crd/js/gcd_host_list_api.js',
       'webapp/crd/js/legacy_host_list_api.js',
     ],
@@ -339,6 +365,27 @@
       '<@(remoting_webapp_js_host_display_files)',
     ],
 
+    'remoting_webapp_template_public_session':
+      '<(DEPTH)/remoting/webapp/crd/html/template_public_session.html',
+
+    # The shared JavaScript files required by public_session.html.
+    'remoting_webapp_public_session_html_all_js_files': [
+      '<@(remoting_webapp_shared_js_core_files)',
+      '<@(remoting_webapp_shared_js_auth_google_files)',
+      '<@(remoting_webapp_shared_js_client_files)',
+      '<@(remoting_webapp_shared_js_host_files)',
+      '<@(remoting_webapp_shared_js_logging_files)',
+      '<@(remoting_webapp_shared_js_signaling_files)',
+      '<@(remoting_webapp_shared_js_ui_files)',
+      '<@(remoting_webapp_js_it2me_host_control_files)',
+      'webapp/crd/js/public_session_main.js',
+    ],
+
+    # These template files are used to construct public_session.html.
+    'remoting_webapp_public_session_template_files': [
+      'webapp/crd/html/dialog_host.html',
+    ],
+
     # The JS files required by unittest.html.
     'remoting_webapp_unittest_html_all_js_files': [
       '<@(remoting_webapp_shared_main_html_js_files)',
@@ -484,6 +531,7 @@
       '<@(remoting_webapp_shared_js_files)',
       '<@(remoting_webapp_crd_main_html_all_js_files)',
       '<@(remoting_webapp_credits_html_all_js_files)',
+      '<@(remoting_webapp_public_session_html_all_js_files)',
     ],
 
     'remoting_webapp_info_files': [
@@ -524,6 +572,7 @@
       'webapp/crd/html/crd_main.css',
       'webapp/crd/html/toolbar.css',
       'webapp/crd/html/menu_button.css',
+      'webapp/crd/html/public_session.css',
       'webapp/crd/html/window_frame.css',
       'webapp/crd/resources/scale-to-fit.webp',
     ],