BASELINE: Update Chromium to 59.0.3071.134

Change-Id: Id02ef6fb2204c5fd21668a1c3e6911c83b17585a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

20 files changed, 258 insertions, 94 deletions

diff --git a/chromium/remoting/BUILD.gn b/chromium/remoting/BUILD.gn
index a630f569f83..d2b0db8c67d 100644
--- a/chromium/remoting/BUILD.gn
+++ b/chromium/remoting/BUILD.gn
@@ -37,6 +37,10 @@ group("remoting_all") {
     ]
   }
 
+  if (is_ios) {
+    deps += [ "//remoting/client/ios:all" ]
+  }
+
   if (enable_remoting_host) {
     deps += [
       "//remoting:remoting_perftests",
@@ -60,7 +64,10 @@ group("remoting_all") {
     }
 
     if (is_linux && !is_chromeos) {
-      deps += [ "//remoting/host/linux:remoting_dev_me2me_host" ]
+      deps += [
+        "//remoting/host/linux:remoting_dev_me2me_host",
+        "//remoting/host/linux:remoting_user_session",
+      ]
     }
   }
 
@@ -168,6 +175,8 @@ test("remoting_unittests") {
 
   if (is_android) {
     deps += [ "//net/android:net_java" ]
+
+    libs += [ "android" ]
   }
 
   if (is_win) {
diff --git a/chromium/remoting/android/BUILD.gn b/chromium/remoting/android/BUILD.gn
index 1be3c3e9940..248c1ea04b7 100644
--- a/chromium/remoting/android/BUILD.gn
+++ b/chromium/remoting/android/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//remoting/android/client_java_tmpl.gni")
 import("//remoting/android/remoting_apk_tmpl.gni")
+import("//remoting/credits/credits.gni")
 import("//remoting/remoting_options.gni")
 import("//remoting/tools/build/remoting_localize.gni")
 
@@ -19,67 +20,14 @@ generate_jni("jni_headers") {
   jni_package = "remoting"
 }
 
-shared_library("remoting_client_jni") {
-  deps = [
-    "//remoting/android:jni_headers",
-    "//remoting/base",
-    "//remoting/client",
-    "//remoting/client/display",
-    "//remoting/protocol",
-    "//ui/events:dom_keycode_converter",
-    "//ui/gfx",
-  ]
-  sources = [
-    "//remoting/client/audio_player_android.cc",
-    "//remoting/client/audio_player_android.h",
-    "//remoting/client/jni/android_keymap.cc",
-    "//remoting/client/jni/android_keymap.h",
-    "//remoting/client/jni/chromoting_jni_instance.cc",
-    "//remoting/client/jni/chromoting_jni_instance.h",
-    "//remoting/client/jni/chromoting_jni_runtime.cc",
-    "//remoting/client/jni/chromoting_jni_runtime.h",
-    "//remoting/client/jni/connect_to_host_info.cc",
-    "//remoting/client/jni/connect_to_host_info.h",
-    "//remoting/client/jni/display_updater_factory.h",
-    "//remoting/client/jni/egl_thread_context.cc",
-    "//remoting/client/jni/egl_thread_context.h",
-    "//remoting/client/jni/jni_client.cc",
-    "//remoting/client/jni/jni_client.h",
-    "//remoting/client/jni/jni_gl_display_handler.cc",
-    "//remoting/client/jni/jni_gl_display_handler.h",
-    "//remoting/client/jni/jni_pairing_secret_fetcher.cc",
-    "//remoting/client/jni/jni_pairing_secret_fetcher.h",
-    "//remoting/client/jni/jni_touch_event_data.cc",
-    "//remoting/client/jni/jni_touch_event_data.h",
-    "//remoting/client/jni/remoting_jni_onload.cc",
-    "//remoting/client/jni/remoting_jni_registrar.cc",
-    "//remoting/client/jni/remoting_jni_registrar.h",
-  ]
-  libs = [
-    "android",
-    "OpenSLES",
-    "EGL",
-  ]
-  configs += [ "//remoting/build/config:enable_webrtc_remoting_client" ]
-  assert_no_deps = [ "//third_party/ffmpeg:*" ]
-}
+_raw_resources_base_dir = "$target_gen_dir/credits_resources_raw/res"
 
-_raw_resources_base_dir = "$target_gen_dir/remoting_android_raw_resources/res"
-copy("remoting_android_raw_resources") {
-  _credits_html = get_label_info("//remoting/webapp:credits",
-                                 "target_gen_dir") + "/credits.html"
-  sources = [
-    "//remoting/webapp/base/html/credits_css.css",
-    "//remoting/webapp/base/html/main.css",
-    "//remoting/webapp/base/js/credits_js.js",
-    _credits_html,
-  ]
-  outputs = [
-    "$_raw_resources_base_dir/raw/{{source_file_part}}",
-  ]
-  deps = [
-    "//remoting/webapp:credits",
-  ]
+# The target is named this way, instead of "..._raw_resources", specifically
+# to avoid matching any of the _java_target_whitelist items in
+# build/config/android/internal_rules.gni
+remoting_credits("credits_resources_raw") {
+  credits_gen_dir = "$_raw_resources_base_dir/raw"
+  gn_target = "//remoting/android:remoting_apk"
 }
 
 remoting_localize("remoting_apk_manifest") {
@@ -95,11 +43,9 @@ android_resources("remoting_android_client_java_resources") {
   custom_package = "org.chromium.chromoting"
   resource_dirs = [ "java/res" ]
   generated_resource_dirs = [ _raw_resources_base_dir ]
-  generated_resource_files =
-      get_target_outputs(":remoting_android_raw_resources")
-
+  generated_resource_files = get_target_outputs(":credits_resources_raw")
   deps = [
-    ":remoting_android_raw_resources",
+    ":credits_resources_raw",
     "//remoting/resources:strings_java",
     "//third_party/android_tools:android_support_v7_appcompat_java",
   ]
diff --git a/chromium/remoting/android/remoting_apk_tmpl.gni b/chromium/remoting/android/remoting_apk_tmpl.gni
index 6f1dbb87151..9ad8d0ed8b4 100644
--- a/chromium/remoting/android/remoting_apk_tmpl.gni
+++ b/chromium/remoting/android/remoting_apk_tmpl.gni
@@ -11,6 +11,6 @@ template("remoting_apk_tmpl") {
 
     android_manifest = "$root_gen_dir/remoting/android/AndroidManifest.xml"
     android_manifest_dep = "//remoting/android:remoting_apk_manifest"
-    shared_libraries = [ "//remoting/android:remoting_client_jni" ]
+    shared_libraries = [ "//remoting/client/jni:remoting_client_jni" ]
   }
 }
diff --git a/chromium/remoting/base/BUILD.gn b/chromium/remoting/base/BUILD.gn
index da46b4b265a..8736da9b21c 100644
--- a/chromium/remoting/base/BUILD.gn
+++ b/chromium/remoting/base/BUILD.gn
@@ -22,13 +22,18 @@ source_set("base") {
     "constants.h",
     "leaky_bucket.cc",
     "leaky_bucket.h",
+    "name_value_map.h",
     "rate_counter.cc",
     "rate_counter.h",
+    "remoting_bot.cc",
+    "remoting_bot.h",
     "rsa_key_pair.cc",
     "rsa_key_pair.h",
     "running_samples.cc",
     "running_samples.h",
     "scoped_sc_handle_win.h",
+    "service_urls.cc",
+    "service_urls.h",
     "socket_reader.cc",
     "socket_reader.h",
     "telemetry_log_writer.cc",
@@ -56,6 +61,7 @@ source_set("base") {
   ]
   deps = [
     "//base/third_party/dynamic_annotations",
+    "//google_apis",
     "//third_party/libvpx",
     "//third_party/libyuv",
     "//third_party/webrtc/modules/desktop_capture:primitives",
@@ -65,9 +71,11 @@ source_set("base") {
     sources -= [
       "chromium_url_request.cc",
       "chromoting_event.cc",
+      "service_urls.cc",
       "telemetry_log_writer.cc",
       "url_request_context_getter.cc",
     ]
+    deps -= [ "//google_apis" ]
   }
 }
 
@@ -100,6 +108,7 @@ source_set("breakpad") {
   sources = [
     "breakpad.h",
     "breakpad_linux.cc",
+    "breakpad_linux.h",
     "breakpad_mac.mm",
     "breakpad_win.cc",
   ]
diff --git a/chromium/remoting/client/BUILD.gn b/chromium/remoting/client/BUILD.gn
index 9f0063d87b5..4ad8bb3c2ab 100644
--- a/chromium/remoting/client/BUILD.gn
+++ b/chromium/remoting/client/BUILD.gn
@@ -13,13 +13,15 @@ static_library("client") {
     "audio_player.h",
     "chromoting_client.cc",
     "chromoting_client.h",
+    "chromoting_session.cc",
+    "chromoting_session.h",
     "client_context.cc",
     "client_context.h",
-    "client_status_logger.cc",
-    "client_status_logger.h",
     "client_telemetry_logger.cc",
     "client_telemetry_logger.h",
     "client_user_interface.h",
+    "connect_to_host_info.cc",
+    "connect_to_host_info.h",
     "cursor_shape_stub_proxy.cc",
     "cursor_shape_stub_proxy.h",
     "dual_buffer_frame_consumer.cc",
@@ -30,6 +32,8 @@ static_library("client") {
     "host_experiment_sender.h",
     "key_event_mapper.cc",
     "key_event_mapper.h",
+    "native_device_keymap.cc",
+    "native_device_keymap.h",
     "normalizing_input_filter_cros.cc",
     "normalizing_input_filter_cros.h",
     "normalizing_input_filter_mac.cc",
@@ -59,11 +63,13 @@ static_library("client") {
     "//remoting/protocol",
     "//third_party/libyuv",
     "//third_party/webrtc/modules/desktop_capture:primitives",
+    "//ui/events:dom_keycode_converter",
   ]
 
+  libs = []
+
   if (is_nacl) {
     sources -= [
-      "client_status_logger.cc",
       "client_telemetry_logger.cc",
       "server_log_entry_client.cc",
     ]
@@ -73,6 +79,18 @@ static_library("client") {
       "chromoting_client_runtime.h",
     ]
   }
+  if (is_android) {
+    sources += [
+      "audio_player_android.cc",
+      "audio_player_android.h",
+      "native_device_keymap_android.cc",
+    ]
+    sources -= [ "native_device_keymap.cc" ]
+    libs += [
+      "android",
+      "OpenSLES",
+    ]
+  }
 }
 
 source_set("unit_tests") {
@@ -84,7 +102,6 @@ source_set("unit_tests") {
   sources = [
     "audio_player_unittest.cc",
     "chromoting_client_runtime_unittest.cc",
-    "client_status_logger_unittest.cc",
     "client_telemetry_logger_unittest.cc",
     "dual_buffer_frame_consumer_unittest.cc",
     "empty_cursor_filter_unittest.cc",
@@ -109,6 +126,6 @@ source_set("unit_tests") {
     "//remoting/proto",
     "//testing/gmock",
     "//testing/gtest",
-    "//third_party/webrtc/base:rtc_base",
+    "//third_party/webrtc/base:rtc_base_approved",
   ]
 }
diff --git a/chromium/remoting/client/display/BUILD.gn b/chromium/remoting/client/display/BUILD.gn
index 9716d4cd084..c2d5007bbe3 100644
--- a/chromium/remoting/client/display/BUILD.gn
+++ b/chromium/remoting/client/display/BUILD.gn
@@ -30,7 +30,7 @@ source_set("display") {
   deps = [
     "//remoting/proto",
     "//third_party/libyuv",
-    "//third_party/webrtc/base:rtc_base",
+    "//third_party/webrtc/base:rtc_base_approved",
   ]
 
   public_configs = [ "//third_party/khronos:khronos_headers" ]
@@ -85,7 +85,7 @@ if (is_win) {
       "//remoting/proto",
       "//testing/gmock",
       "//testing/gtest",
-      "//third_party/webrtc/base:rtc_base",
+      "//third_party/webrtc/base:rtc_base_approved",
     ]
   }
 }
diff --git a/chromium/remoting/client/ios/BUILD.gn b/chromium/remoting/client/ios/BUILD.gn
index 5a086032e55..55b1894b174 100644
--- a/chromium/remoting/client/ios/BUILD.gn
+++ b/chromium/remoting/client/ios/BUILD.gn
@@ -9,6 +9,7 @@ group("all") {
 
   deps = [
     ":ios_core",
+    "./app:all",
     "./bridge:all",
   ]
 }
@@ -24,12 +25,8 @@ group("all_test") {
 
 source_set("ios_core") {
   sources = [
-    "app_runtime.cc",
-    "app_runtime.h",
     "client_gestures.h",
     "client_gestures.mm",
-    "host.h",
-    "host.mm",
     "host_preferences.h",
     "host_preferences.mm",
     "host_preferences_persistence.h",
@@ -42,9 +39,16 @@ source_set("ios_core") {
 
   if (!is_chrome_branded) {
     sources += [ "host_preferences_persistence_chromium.mm" ]
+  } else {
+    # TODO(nicholss): Until we have a private implementation of this, stub it
+    # with the chromium version. We still want the logic of is_chrome_branded
+    # but to get the release builds building we will just reuse the file.
+    sources += [ "host_preferences_persistence_chromium.mm" ]
   }
 
   public_deps = [
+    "//remoting/client/ios/domain",
+    "//remoting/client/ios/facade",
     "//third_party/webrtc/base:rtc_base",
     "//third_party/webrtc/modules/desktop_capture:primitives",
   ]
@@ -72,8 +76,6 @@ source_set("ios_core_unit_tests") {
   ]
 
   sources = [
-    #    "host_refresh_unittest.mm",
-    #    "host_refresh_unittest_helper.h",
     "key_input_unittest.mm",
   ]
 
diff --git a/chromium/remoting/client/ios/app/BUILD.gn b/chromium/remoting/client/ios/app/BUILD.gn
index 2e13eefb61f..f775b25b1c5 100644
--- a/chromium/remoting/client/ios/app/BUILD.gn
+++ b/chromium/remoting/client/ios/app/BUILD.gn
@@ -2,9 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/mac/tweak_info_plist.gni")
-import("//build/config/ios/rules.gni")
 import("//build/config/chrome_build.gni")
+import("//build/config/ios/rules.gni")
+import("//build/mac/tweak_info_plist.gni")
 import("//build/util/process_version.gni")
 import("//remoting/build/config/remoting_build.gni")
 
@@ -20,21 +20,37 @@ source_set("main") {
   sources = [
     "app_delegate.h",
     "app_delegate.mm",
-    "example_view_controller.h",
-    "example_view_controller.mm",
+    "host_collection_view_cell.h",
+    "host_collection_view_cell.mm",
+    "host_collection_view_controller.h",
+    "host_collection_view_controller.mm",
+    "host_view_controller.h",
+    "host_view_controller.mm",
     "main.mm",
+    "pin_entry_view_controller.h",
+    "pin_entry_view_controller.mm",
+    "remoting_settings_view_controller.h",
+    "remoting_settings_view_controller.mm",
+    "remoting_view_controller.h",
+    "remoting_view_controller.mm",
   ]
 
   deps = [
     "//base",
+    "//google_apis",
     "//remoting/base",
     "//remoting/client",
+    "//remoting/client/ios:ios_core",
     "//remoting/protocol",
     "//ui/base",
     "//ui/gfx",
     "//ui/resources",
   ]
 
+  public_deps = [
+    "//ios/third_party/material_components_ios",
+  ]
+
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
@@ -76,6 +92,15 @@ ios_app_bundle("ios_remoting_app") {
   deps = [
     ":main",
     "//base",
+    "//remoting/client/ios/app/resources:assets",
+    "//remoting/client/ios/app/resources:launchscreen_assets",
+    "//remoting/client/ios/app/resources:remoting_icons",
     "//remoting/client/ios/display",
   ]
+
+  bundle_deps = [ ":launchscreen_storyboard" ]
+}
+
+bundle_data_ib_file("launchscreen_storyboard") {
+  source = "resources/LaunchScreen.storyboard"
 }
diff --git a/chromium/remoting/client/ios/facade/BUILD.gn b/chromium/remoting/client/ios/facade/BUILD.gn
index c455e09bc07..8bdcbff4376 100644
--- a/chromium/remoting/client/ios/facade/BUILD.gn
+++ b/chromium/remoting/client/ios/facade/BUILD.gn
@@ -8,12 +8,17 @@ import("//remoting/build/config/remoting_build.gni")
 
 source_set("facade") {
   sources = [
+    "host_info.cc",
+    "host_info.h",
+    "host_list_fetcher.cc",
+    "host_list_fetcher.h",
     "remoting_service.h",
     "remoting_service.mm",
   ]
 
   deps = [
     "//base",
+    "//remoting/base:authorization",
     "//remoting/client/ios/domain",
   ]
 
diff --git a/chromium/remoting/client/ios/session/BUILD.gn b/chromium/remoting/client/ios/session/BUILD.gn
new file mode 100644
index 00000000000..843a023b6bd
--- /dev/null
+++ b/chromium/remoting/client/ios/session/BUILD.gn
@@ -0,0 +1,24 @@
+# Copyright 2017 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/chrome_build.gni")
+import("//build/config/ios/rules.gni")
+import("//remoting/build/config/remoting_build.gni")
+
+source_set("session") {
+  sources = [
+    "remoting_client.h",
+    "remoting_client.mm",
+    "remoting_client_session_delegate.h",
+    "remoting_client_session_delegate.mm",
+  ]
+
+  deps = [
+    "//base",
+    "//remoting/client",
+    "//remoting/client/ios/domain",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
diff --git a/chromium/remoting/client/jni/BUILD.gn b/chromium/remoting/client/jni/BUILD.gn
new file mode 100644
index 00000000000..b7eeb55a933
--- /dev/null
+++ b/chromium/remoting/client/jni/BUILD.gn
@@ -0,0 +1,52 @@
+# Copyright 2017 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/android/config.gni")
+import("//build/config/android/rules.gni")
+import("//remoting/android/client_java_tmpl.gni")
+import("//remoting/android/remoting_apk_tmpl.gni")
+import("//remoting/remoting_options.gni")
+
+group("jni") {
+  testonly = true
+
+  deps = [
+    ":remoting_client_jni",
+  ]
+}
+
+shared_library("remoting_client_jni") {
+  deps = [
+    "//remoting/android:jni_headers",
+    "//remoting/base",
+    "//remoting/client",
+    "//remoting/client/display",
+    "//remoting/protocol",
+    "//ui/gfx",
+  ]
+  sources = [
+    "display_updater_factory.h",
+    "egl_thread_context.cc",
+    "egl_thread_context.h",
+    "jni_client.cc",
+    "jni_client.h",
+    "jni_gl_display_handler.cc",
+    "jni_gl_display_handler.h",
+    "jni_pairing_secret_fetcher.cc",
+    "jni_pairing_secret_fetcher.h",
+    "jni_runtime_delegate.cc",
+    "jni_runtime_delegate.h",
+    "jni_touch_event_data.cc",
+    "jni_touch_event_data.h",
+    "remoting_jni_onload.cc",
+    "remoting_jni_registrar.cc",
+    "remoting_jni_registrar.h",
+  ]
+  libs = [
+    "android",
+    "EGL",
+  ]
+  configs += [ "//remoting/build/config:enable_webrtc_remoting_client" ]
+  assert_no_deps = [ "//third_party/ffmpeg:*" ]
+}
diff --git a/chromium/remoting/credits/credits.gni b/chromium/remoting/credits/credits.gni
new file mode 100644
index 00000000000..5b53725a683
--- /dev/null
+++ b/chromium/remoting/credits/credits.gni
@@ -0,0 +1,63 @@
+# Copyright 2017 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Generates a credits HTML file, based on the third-party dependencies of
+# a provided GN target.
+# Parameters:
+#   gn_target: The target whose dependencies should be listed in the credits.
+#   credits_gen_dir: Directory (without trailing slash) where the generated
+#     HTML will be placed, together with the copied JSS+CS files.
+template("remoting_credits") {
+  _credits_source_dir = "//remoting/credits"
+
+  action("${target_name}__generate") {
+    # Generate credits.html in a temporary location, so it can be copied into
+    # the final location - see comment for 'copy' target.
+    _credits_html_file = "$target_gen_dir/$target_name/credits.html"
+    _credits_template = "$_credits_source_dir/credits.tmpl"
+    _credits_entry_template = "$_credits_source_dir/credits_entry.tmpl"
+    script = "//tools/licenses.py"
+    depfile = "$target_gen_dir/$target_name.d"
+    inputs = [
+      _credits_template,
+      _credits_entry_template,
+    ]
+    outputs = [
+      _credits_html_file,
+    ]
+    args = [
+      "credits",
+      rebase_path(_credits_html_file, root_build_dir),
+      "--file-template",
+      rebase_path(_credits_template, root_build_dir),
+      "--entry-template",
+      rebase_path(_credits_entry_template, root_build_dir),
+      "--depfile",
+      rebase_path(depfile, root_build_dir),
+      "--gn-target",
+      invoker.gn_target,
+      "--gn-out-dir",
+      rebase_path(root_build_dir),
+    ]
+  }
+
+  # This target purposefully copies the generated HTML file (instead of
+  # directly generating the HTML file into credits_gen_dir), so that the caller
+  # can use get_target_outputs(:target_name) and the HTML file will be
+  # included in the returned list along with the JS+CSS files.
+  copy(target_name) {
+    _generate_target = ":${target_name}__generate"
+    _credits_gen_dir = invoker.credits_gen_dir
+    sources = [
+                "$_credits_source_dir/credits_css.css",
+                "$_credits_source_dir/credits_js.js",
+              ] + get_target_outputs(_generate_target)
+    outputs = [
+      "$_credits_gen_dir/{{source_file_part}}",
+    ]
+    deps = [
+      _generate_target,
+    ]
+  }
+}
diff --git a/chromium/remoting/host/BUILD.gn b/chromium/remoting/host/BUILD.gn
index 5b8afbf4b6c..cb35bfe4e52 100644
--- a/chromium/remoting/host/BUILD.gn
+++ b/chromium/remoting/host/BUILD.gn
@@ -265,8 +265,6 @@ static_library("host") {
     "screen_resolution.h",
     "server_log_entry_host.cc",
     "server_log_entry_host.h",
-    "service_urls.cc",
-    "service_urls.h",
     "shutdown_watchdog.cc",
     "shutdown_watchdog.h",
     "signaling_connector.cc",
@@ -309,7 +307,6 @@ static_library("host") {
     "//crypto",
     "//device/power_save_blocker",
     "//google_apis",
-    "//ipc",
     "//remoting/base",
     "//remoting/base:authorization",
     "//remoting/host/security_key",
@@ -320,7 +317,9 @@ static_library("host") {
     "//ui/events/platform",
   ]
 
-  public_deps = []
+  public_deps = [
+    "//ipc",
+  ]
 
   if (!is_ios) {
     deps += [ "//components/policy:generated" ]
@@ -616,6 +615,7 @@ if (enable_remoting_host) {
 
       deps += [
         "//google_apis",
+        "//net",
         "//remoting/host/setup",
       ]
     }
diff --git a/chromium/remoting/host/linux/BUILD.gn b/chromium/remoting/host/linux/BUILD.gn
index de5bbba2873..4315e8709cb 100644
--- a/chromium/remoting/host/linux/BUILD.gn
+++ b/chromium/remoting/host/linux/BUILD.gn
@@ -92,6 +92,7 @@ target("executable", "remoting_native_messaging_host") {
 
   deps = [
     "//base",
+    "//net",
     "//remoting/base:breakpad",
     "//remoting/host",
     "//remoting/host:remoting_infoplist_strings",
diff --git a/chromium/remoting/host/mac/BUILD.gn b/chromium/remoting/host/mac/BUILD.gn
index 96ac977b20d..73cf0e87857 100644
--- a/chromium/remoting/host/mac/BUILD.gn
+++ b/chromium/remoting/host/mac/BUILD.gn
@@ -67,9 +67,10 @@ target("mac_app_bundle", "remoting_me2me_host") {
     "MACOSX_DEPLOYMENT_TARGET=10.7",
   ]
 
-  if (is_chrome_branded && is_official_build) {
-    defines = [ "REMOTING_ENABLE_BREAKPAD" ]
-  }
+  # TODO(joedow): Re-enable or replace with Crashpad: crbug.com/637884.
+  # if (is_chrome_branded && is_official_build) {
+  #   defines = [ "REMOTING_ENABLE_BREAKPAD" ]
+  # }
 
   deps = [
     "//build/config/sanitizers:deps",
@@ -183,6 +184,7 @@ target("mac_app_bundle", "remoting_native_messaging_host") {
 
   deps = [
     "//base",
+    "//net",
     "//remoting/base:breakpad",
     "//remoting/host",
     "//remoting/host:remoting_infoplist_strings",
diff --git a/chromium/remoting/host/win/BUILD.gn b/chromium/remoting/host/win/BUILD.gn
index 4d864c655df..683809b42bc 100644
--- a/chromium/remoting/host/win/BUILD.gn
+++ b/chromium/remoting/host/win/BUILD.gn
@@ -330,6 +330,10 @@ shared_library("remoting_core") {
               "VERSION=$chrome_version_full",
             ]
 
+  if (is_chrome_branded && is_official_build) {
+    defines += [ "REMOTING_ENABLE_BREAKPAD" ]
+  }
+
   if (remoting_multi_process != 0 && remoting_rdp_session != 0) {
     defines += [ "REMOTING_RDP_SESSION" ]
   }
@@ -358,6 +362,7 @@ shared_library("remoting_core") {
     "chromoting_module.cc",
     "chromoting_module.h",
     "core.cc",
+    "core.h",
     "core_resource.h",
     "elevated_native_messaging_host.cc",
     "elevated_native_messaging_host.h",
diff --git a/chromium/remoting/protocol/BUILD.gn b/chromium/remoting/protocol/BUILD.gn
index edda462fb9c..92a4256ecc2 100644
--- a/chromium/remoting/protocol/BUILD.gn
+++ b/chromium/remoting/protocol/BUILD.gn
@@ -104,7 +104,6 @@ static_library("protocol") {
     "monitored_video_stub.h",
     "mouse_input_filter.cc",
     "mouse_input_filter.h",
-    "name_value_map.h",
     "negotiating_authenticator_base.cc",
     "negotiating_authenticator_base.h",
     "negotiating_client_authenticator.cc",
diff --git a/chromium/remoting/remoting_enable.gni b/chromium/remoting/remoting_enable.gni
index 3b9f45e0082..a0319767e03 100644
--- a/chromium/remoting/remoting_enable.gni
+++ b/chromium/remoting/remoting_enable.gni
@@ -6,5 +6,5 @@ import("//build/config/ui.gni")
 import("//media/media_options.gni")
 
 declare_args() {
-  enable_remoting = !is_ios && !is_chromecast && enable_webrtc
+  enable_remoting = !is_chromecast && enable_webrtc
 }
diff --git a/chromium/remoting/signaling/BUILD.gn b/chromium/remoting/signaling/BUILD.gn
index ac5a2aac166..224bd3f38f4 100644
--- a/chromium/remoting/signaling/BUILD.gn
+++ b/chromium/remoting/signaling/BUILD.gn
@@ -14,11 +14,11 @@ static_library("signaling") {
     "log_to_server.h",
     "push_notification_subscriber.cc",
     "push_notification_subscriber.h",
-    "remoting_bot.cc",
-    "remoting_bot.h",
     "server_log_entry.cc",
     "server_log_entry.h",
     "signal_strategy.h",
+    "signaling_address.cc",
+    "signaling_address.h",
     "xmpp_login_handler.cc",
     "xmpp_login_handler.h",
     "xmpp_signal_strategy.cc",
@@ -81,6 +81,7 @@ source_set("unit_tests") {
     "push_notification_subscriber_unittest.cc",
     "server_log_entry_unittest.cc",
     "server_log_entry_unittest.h",
+    "signaling_address_unittest.cc",
     "xmpp_login_handler_unittest.cc",
     "xmpp_signal_strategy_unittest.cc",
     "xmpp_stream_parser_unittest.cc",
@@ -88,6 +89,7 @@ source_set("unit_tests") {
 
   deps = [
     ":test_support",
+    "//net:test_support",
     "//testing/gmock",
     "//testing/gtest",
   ]
diff --git a/chromium/remoting/webapp/files.gni b/chromium/remoting/webapp/files.gni
index f2e55cdaf62..8540ef997e5 100644
--- a/chromium/remoting/webapp/files.gni
+++ b/chromium/remoting/webapp/files.gni
@@ -445,6 +445,9 @@ remoting_webapp_background_html_all_js_files += [
   "base/js/typecheck.js",
   "base/js/xhr.js",
   "base/js/xhr_event_writer.js",
+  "crd/js/host_controller.js",
+  "crd/js/host_daemon_facade.js",
+  "crd/js/native_message_host_log_message_handler.js",
 ]
 
 #