BASELINE: Update Chromium to 58.0.3029.54

Change-Id: I67f57065a7afdc8e4614adb5c0230281428df4d1
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

27 files changed, 406 insertions, 162 deletions

diff --git a/chromium/remoting/BUILD.gn b/chromium/remoting/BUILD.gn
index ba7a70479c8..a630f569f83 100644
--- a/chromium/remoting/BUILD.gn
+++ b/chromium/remoting/BUILD.gn
@@ -107,9 +107,10 @@ group("test_support") {
   deps = [
     "//base",
     "//net",
-    "//remoting/base",
+    "//remoting/base:test_support",
     "//remoting/client",
-    "//remoting/codec",
+    "//remoting/codec:decoder",
+    "//remoting/codec:encoder",
     "//remoting/protocol:test_support",
     "//remoting/resources",
     "//remoting/signaling:test_support",
@@ -162,7 +163,7 @@ test("remoting_unittests") {
   }
 
   if (enable_webrtc) {
-    deps += [ "//third_party/libjingle/webrtc:libjingle_webrtc" ]
+    deps += [ "//third_party/webrtc_overrides:init_webrtc" ]
   }
 
   if (is_android) {
@@ -200,12 +201,12 @@ if (enable_remoting_host) {
       "//net:test_support",
       "//remoting/base",
       "//testing/gtest",
-      "//third_party/libjingle",
       "//third_party/webrtc/modules/desktop_capture",
+      "//third_party/webrtc_overrides",
     ]
 
     if (enable_webrtc) {
-      deps += [ "//third_party/libjingle/webrtc:libjingle_webrtc" ]
+      deps += [ "//third_party/webrtc_overrides:init_webrtc" ]
     }
 
     if (is_win) {
diff --git a/chromium/remoting/android/BUILD.gn b/chromium/remoting/android/BUILD.gn
index bf0969dd08d..1be3c3e9940 100644
--- a/chromium/remoting/android/BUILD.gn
+++ b/chromium/remoting/android/BUILD.gn
@@ -38,6 +38,8 @@ shared_library("remoting_client_jni") {
     "//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",
@@ -59,6 +61,7 @@ shared_library("remoting_client_jni") {
     "EGL",
   ]
   configs += [ "//remoting/build/config:enable_webrtc_remoting_client" ]
+  assert_no_deps = [ "//third_party/ffmpeg:*" ]
 }
 
 _raw_resources_base_dir = "$target_gen_dir/remoting_android_raw_resources/res"
diff --git a/chromium/remoting/base/BUILD.gn b/chromium/remoting/base/BUILD.gn
index 2295e58f7cd..da46b4b265a 100644
--- a/chromium/remoting/base/BUILD.gn
+++ b/chromium/remoting/base/BUILD.gn
@@ -71,6 +71,31 @@ source_set("base") {
   }
 }
 
+source_set("authorization") {
+  sources = [
+    "gaia_oauth_client.cc",
+    "gaia_oauth_client.h",
+    "oauth_client.h",
+    "oauth_helper.cc",
+    "oauth_helper.h",
+    "oauth_token_getter.cc",
+    "oauth_token_getter.h",
+    "oauth_token_getter_impl.cc",
+    "oauth_token_getter_impl.h",
+  ]
+
+  configs += [
+    "//build/config/compiler:wexit_time_destructors",
+    "//remoting/build/config:version",
+  ]
+
+  public_deps = [
+    "//base",
+    "//google_apis",
+    "//net",
+  ]
+}
+
 source_set("breakpad") {
   sources = [
     "breakpad.h",
@@ -92,6 +117,31 @@ source_set("breakpad") {
   }
 }
 
+static_library("test_support") {
+  testonly = true
+
+  sources = [
+    "fake_oauth_token_getter.cc",
+    "fake_oauth_token_getter.h",
+    "mock_oauth_client.cc",
+    "mock_oauth_client.h",
+    "test_rsa_key_pair.h",
+  ]
+
+  deps = [
+    "//remoting/proto",
+  ]
+  public_deps = [
+    ":authorization",
+    ":base",
+    ":breakpad",
+    "//base",
+    "//testing/gmock",
+    "//testing/gtest",
+    "//third_party/protobuf:protobuf_lite",
+  ]
+}
+
 source_set("unit_tests") {
   testonly = true
 
@@ -102,24 +152,20 @@ source_set("unit_tests") {
     "buffered_socket_writer_unittest.cc",
     "capabilities_unittest.cc",
     "compound_buffer_unittest.cc",
+    "oauth_helper_unittest.cc",
     "rate_counter_unittest.cc",
     "rsa_key_pair_unittest.cc",
     "run_all_unittests.cc",
     "running_samples_unittest.cc",
     "telemetry_log_writer_unittest.cc",
-    "test_rsa_key_pair.h",
     "typed_buffer_unittest.cc",
     "util_unittest.cc",
   ]
 
   deps = [
-    ":base",
-    ":breakpad",
-    "//base",
+    ":test_support",
     "//mojo/edk/system",
     "//net:test_support",
-    "//testing/gmock",
-    "//testing/gtest",
     "//third_party/libyuv",
     "//third_party/webrtc/modules/desktop_capture:primitives",
   ]
diff --git a/chromium/remoting/build/config/BUILD.gn b/chromium/remoting/build/config/BUILD.gn
index a06726775ca..399a98118b9 100644
--- a/chromium/remoting/build/config/BUILD.gn
+++ b/chromium/remoting/build/config/BUILD.gn
@@ -21,10 +21,6 @@ config("enable_webrtc_remoting_client") {
 config("remoting_me2me_host") {
   defines = []
 
-  if (is_mac && is_official_build) {
-    defines += [ "USE_REMOTING_MACOSX_INTERNAL" ]
-  }
-
   if (is_win && remoting_multi_process != 0 && remoting_rdp_session != 0) {
     defines += [ "REMOTING_RDP_SESSION" ]
   }
diff --git a/chromium/remoting/client/BUILD.gn b/chromium/remoting/client/BUILD.gn
index bb8345a710c..9f0063d87b5 100644
--- a/chromium/remoting/client/BUILD.gn
+++ b/chromium/remoting/client/BUILD.gn
@@ -26,6 +26,8 @@ static_library("client") {
     "dual_buffer_frame_consumer.h",
     "empty_cursor_filter.cc",
     "empty_cursor_filter.h",
+    "host_experiment_sender.cc",
+    "host_experiment_sender.h",
     "key_event_mapper.cc",
     "key_event_mapper.h",
     "normalizing_input_filter_cros.cc",
@@ -53,7 +55,7 @@ static_library("client") {
 
   deps = [
     "//remoting/base",
-    "//remoting/codec",
+    "//remoting/codec:decoder",
     "//remoting/protocol",
     "//third_party/libyuv",
     "//third_party/webrtc/modules/desktop_capture:primitives",
diff --git a/chromium/remoting/client/ios/BUILD.gn b/chromium/remoting/client/ios/BUILD.gn
index b2644f157dd..5a086032e55 100644
--- a/chromium/remoting/client/ios/BUILD.gn
+++ b/chromium/remoting/client/ios/BUILD.gn
@@ -9,7 +9,6 @@ group("all") {
 
   deps = [
     ":ios_core",
-    ":main",
     "./bridge:all",
   ]
 }
@@ -23,30 +22,6 @@ group("all_test") {
   ]
 }
 
-source_set("main") {
-  sources = [
-    "app_delegate.h",
-    "app_delegate.mm",
-    "example_view_controller.h",
-    "example_view_controller.mm",
-    "main.mm",
-  ]
-
-  deps = [
-    "//base",
-    "//remoting/base",
-    "//remoting/client",
-    "//remoting/client/ios/bridge",
-    "//remoting/protocol",
-    "//third_party/google_toolbox_for_mac",
-    "//ui/base",
-    "//ui/gfx",
-    "//ui/resources",
-  ]
-
-  configs += [ "//build/config/compiler:enable_arc" ]
-}
-
 source_set("ios_core") {
   sources = [
     "app_runtime.cc",
diff --git a/chromium/remoting/client/ios/app/BUILD.gn b/chromium/remoting/client/ios/app/BUILD.gn
new file mode 100644
index 00000000000..2e13eefb61f
--- /dev/null
+++ b/chromium/remoting/client/ios/app/BUILD.gn
@@ -0,0 +1,81 @@
+# 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/mac/tweak_info_plist.gni")
+import("//build/config/ios/rules.gni")
+import("//build/config/chrome_build.gni")
+import("//build/util/process_version.gni")
+import("//remoting/build/config/remoting_build.gni")
+
+group("all") {
+  testonly = true
+
+  deps = [
+    ":ios_remoting_app",
+  ]
+}
+
+source_set("main") {
+  sources = [
+    "app_delegate.h",
+    "app_delegate.mm",
+    "example_view_controller.h",
+    "example_view_controller.mm",
+    "main.mm",
+  ]
+
+  deps = [
+    "//base",
+    "//remoting/base",
+    "//remoting/client",
+    "//remoting/protocol",
+    "//ui/base",
+    "//ui/gfx",
+    "//ui/resources",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+tweak_info_plist("tweak_info_plist") {
+  info_plist = "//remoting/client/ios/app/resources/Info.plist"
+  args = [ "--platform=ios" ]
+}
+
+ios_app_bundle("ios_remoting_app") {
+  output_name = "remoting-ios"
+
+  entitlements_path = "resources/Remoting.entitlements"
+  info_plist_target = ":tweak_info_plist"
+
+  extra_substitutions = [
+    "BUNDLE_IDENTIFIER=$remoting_ios_bundle_id",
+    "DISPLAY_NAME=$remoting_ios_display_name",
+    "EXECUTABLE_NAME=$remoting_ios_executable_name",
+    "MINIMUM_OS_VERSION=7.0",
+    "PRODUCT_NAME=$remoting_ios_product_name",
+    "VERSION_FULL=$remoting_version_full",
+    "VERSION_SHORT=$remoting_version_short",
+  ]
+
+  libs = [
+    "Accelerate.framework",
+    "AudioToolbox.framework",
+    "CoreAudio.framework",
+    "CoreData.framework",
+    "CoreMIDI.framework",
+    "CoreVideo.framework",
+    "GLKit.framework",
+    "OpenGLES.framework",
+    "Webkit.framework",
+    "SafariServices.framework",
+    "SystemConfiguration.framework",
+  ]
+
+  deps = [
+    ":main",
+    "//base",
+    "//remoting/client/ios/display",
+  ]
+}
diff --git a/chromium/remoting/client/ios/app/resources/BUILD.gn b/chromium/remoting/client/ios/app/resources/BUILD.gn
new file mode 100644
index 00000000000..5f15eb31c95
--- /dev/null
+++ b/chromium/remoting/client/ios/app/resources/BUILD.gn
@@ -0,0 +1,74 @@
+# 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")
+
+bundle_data("assets") {
+  sources = [
+    "Assets.xcassets/ic_desktop.imageset/Contents.json",
+    "Assets.xcassets/ic_desktop.imageset/ic_desktop.png",
+    "Assets.xcassets/ic_desktop.imageset/ic_desktop@2x.png",
+    "Assets.xcassets/ic_desktop.imageset/ic_desktop@3x.png",
+    "Assets.xcassets/ic_desktop_windows.imageset/Contents.json",
+    "Assets.xcassets/ic_desktop_windows.imageset/ic_desktop_windows.png",
+    "Assets.xcassets/ic_desktop_windows.imageset/ic_desktop_windows@2x.png",
+    "Assets.xcassets/ic_desktop_windows.imageset/ic_desktop_windows@3x.png",
+    "Assets.xcassets/ic_fullscreen.imageset/Contents.json",
+    "Assets.xcassets/ic_fullscreen.imageset/ic_fullscreen.png",
+    "Assets.xcassets/ic_fullscreen.imageset/ic_fullscreen@2x.png",
+    "Assets.xcassets/ic_fullscreen.imageset/ic_fullscreen@3x.png",
+    "Assets.xcassets/ic_fullscreen_exit.imageset/Contents.json",
+    "Assets.xcassets/ic_fullscreen_exit.imageset/ic_fullscreen_exit.png",
+    "Assets.xcassets/ic_fullscreen_exit.imageset/ic_fullscreen_exit@2x.png",
+    "Assets.xcassets/ic_fullscreen_exit.imageset/ic_fullscreen_exit@3x.png",
+    "Assets.xcassets/ic_mouse.imageset/Contents.json",
+    "Assets.xcassets/ic_mouse.imageset/ic_mouse.png",
+    "Assets.xcassets/ic_mouse.imageset/ic_mouse@2x.png",
+    "Assets.xcassets/ic_mouse.imageset/ic_mouse@3x.png",
+    "Assets.xcassets/ic_touch_app.imageset/Contents.json",
+    "Assets.xcassets/ic_touch_app.imageset/ic_touch_app.png",
+    "Assets.xcassets/ic_touch_app.imageset/ic_touch_app_2x.png",
+    "Assets.xcassets/ic_touch_app.imageset/ic_touch_app_3x.png",
+  ]
+  outputs = [
+    "{{bundle_resources_dir}}/{{source_file_part}}",
+  ]
+}
+
+bundle_data("launchscreen_assets") {
+  sources = [
+    "launchscreen_images.xcassets/Contents.json",
+    "launchscreen_images.xcassets/launchscreen_app_logo.imageset/Contents.json",
+    "launchscreen_images.xcassets/launchscreen_app_logo.imageset/launchscreen_app_logo.png",
+    "launchscreen_images.xcassets/launchscreen_app_logo.imageset/launchscreen_app_logo@2x.png",
+    "launchscreen_images.xcassets/launchscreen_app_logo.imageset/launchscreen_app_logo@3x.png",
+    "launchscreen_images.xcassets/launchscreen_brand_name.imageset/Contents.json",
+    "launchscreen_images.xcassets/launchscreen_brand_name.imageset/launchscreen_brand_name.png",
+    "launchscreen_images.xcassets/launchscreen_brand_name.imageset/launchscreen_brand_name@2x.png",
+    "launchscreen_images.xcassets/launchscreen_brand_name.imageset/launchscreen_brand_name@3x.png",
+  ]
+  outputs = [
+    "{{bundle_resources_dir}}/{{source_file_part}}",
+  ]
+}
+
+bundle_data("remoting_icons") {
+  sources = [
+    "chromium/Icon-120.png",
+    "chromium/Icon-152.png",
+    "chromium/Icon-167.png",
+    "chromium/Icon-180.png",
+    "chromium/Icon-29.png",
+    "chromium/Icon-40.png",
+    "chromium/Icon-58.png",
+    "chromium/Icon-76.png",
+    "chromium/Icon-80.png",
+    "chromium/Icon-87.png",
+  ]
+  outputs = [
+    "{{bundle_resources_dir}}/{{source_file_part}}",
+  ]
+}
diff --git a/chromium/remoting/client/ios/display/BUILD.gn b/chromium/remoting/client/ios/display/BUILD.gn
new file mode 100644
index 00000000000..548667d81a5
--- /dev/null
+++ b/chromium/remoting/client/ios/display/BUILD.gn
@@ -0,0 +1,45 @@
+# 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.
+
+group("all") {
+  testonly = true
+
+  deps = [
+    ":display",
+  ]
+}
+
+group("all_test") {
+  testonly = true
+
+  deps = []
+}
+
+source_set("display") {
+  sources = [
+    "gl_demo_screen.h",
+    "gl_demo_screen.mm",
+    "gl_display_handler.h",
+    "gl_display_handler.mm",
+  ]
+
+  public_deps = [
+    "//remoting/client",
+    "//remoting/client/display",
+    "//remoting/client/ios/bridge",
+    "//third_party/webrtc/base:rtc_base_approved",
+  ]
+
+  deps = [
+    "//base",
+  ]
+
+  libs = [
+    "CoreGraphics.framework",
+    "GLKit.framework",
+    "OpenGLES.framework",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
diff --git a/chromium/remoting/client/ios/domain/BUILD.gn b/chromium/remoting/client/ios/domain/BUILD.gn
new file mode 100644
index 00000000000..7d3dd2f24c3
--- /dev/null
+++ b/chromium/remoting/client/ios/domain/BUILD.gn
@@ -0,0 +1,18 @@
+# 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("domain") {
+  sources = [
+    "host_info.h",
+    "host_info.mm",
+    "user_info.h",
+    "user_info.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
diff --git a/chromium/remoting/client/ios/facade/BUILD.gn b/chromium/remoting/client/ios/facade/BUILD.gn
new file mode 100644
index 00000000000..c455e09bc07
--- /dev/null
+++ b/chromium/remoting/client/ios/facade/BUILD.gn
@@ -0,0 +1,21 @@
+# 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("facade") {
+  sources = [
+    "remoting_service.h",
+    "remoting_service.mm",
+  ]
+
+  deps = [
+    "//base",
+    "//remoting/client/ios/domain",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
diff --git a/chromium/remoting/client/plugin/BUILD.gn b/chromium/remoting/client/plugin/BUILD.gn
index fc5963be2ab..b2eb6c7b3eb 100644
--- a/chromium/remoting/client/plugin/BUILD.gn
+++ b/chromium/remoting/client/plugin/BUILD.gn
@@ -49,7 +49,6 @@ executable("remoting_client_plugin_newlib") {
     "//ppapi/native_client:ppapi_lib",
     "//remoting/base",
     "//remoting/client",
-    "//remoting/codec",
     "//remoting/protocol",
     "//remoting/signaling",
     "//third_party/libyuv",
diff --git a/chromium/remoting/codec/BUILD.gn b/chromium/remoting/codec/BUILD.gn
index 2c8d343a899..85896de9f5e 100644
--- a/chromium/remoting/codec/BUILD.gn
+++ b/chromium/remoting/codec/BUILD.gn
@@ -2,13 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-source_set("codec") {
-  deps = [
-    ":decoder",
-    ":encoder",
-  ]
-}
-
 source_set("encoder") {
   sources = [
     "audio_encoder.h",
@@ -41,29 +34,6 @@ source_set("encoder") {
     "//ui/gfx:color_space",
   ]
 
-  if (is_nacl) {
-    sources -= [
-      "audio_encoder.h",
-      "audio_encoder_opus.cc",
-      "audio_encoder_opus.h",
-      "video_encoder.cc",
-      "video_encoder.h",
-      "video_encoder_helper.cc",
-      "video_encoder_helper.h",
-      "video_encoder_verbatim.cc",
-      "video_encoder_verbatim.h",
-      "video_encoder_vpx.cc",
-      "video_encoder_vpx.h",
-      "webrtc_video_encoder_vpx.cc",
-      "webrtc_video_encoder_vpx.h",
-    ]
-    deps -= [
-      "//media",
-      "//media:shared_memory_support",
-      "//ui/gfx:color_space",
-    ]
-  }
-
   # Opus depends on //media, which is not a supported include for iOS.
   # Also disabled it on Android, to avoid dependency on //media.
   # TODO(sergeyu): Cleanup host-only deps in client targets.
@@ -139,7 +109,8 @@ source_set("unit_tests") {
   ]
 
   deps = [
-    ":codec",
+    ":decoder",
+    ":encoder",
     "//base",
     "//remoting/proto",
     "//testing/gtest",
diff --git a/chromium/remoting/host/BUILD.gn b/chromium/remoting/host/BUILD.gn
index eb74514729d..5b8afbf4b6c 100644
--- a/chromium/remoting/host/BUILD.gn
+++ b/chromium/remoting/host/BUILD.gn
@@ -235,10 +235,6 @@ static_library("host") {
     "mouse_cursor_monitor_proxy.h",
     "mouse_shape_pump.cc",
     "mouse_shape_pump.h",
-    "oauth_token_getter.cc",
-    "oauth_token_getter.h",
-    "oauth_token_getter_impl.cc",
-    "oauth_token_getter_impl.h",
     "pairing_registry_delegate.cc",
     "pairing_registry_delegate.h",
     "pairing_registry_delegate_linux.cc",
@@ -315,6 +311,7 @@ static_library("host") {
     "//google_apis",
     "//ipc",
     "//remoting/base",
+    "//remoting/base:authorization",
     "//remoting/host/security_key",
     "//remoting/protocol",
     "//remoting/resources",
@@ -450,12 +447,8 @@ static_library("test_support") {
     "fake_host_status_monitor.h",
     "fake_mouse_cursor_monitor.cc",
     "fake_mouse_cursor_monitor.h",
-    "fake_oauth_token_getter.cc",
-    "fake_oauth_token_getter.h",
     "host_mock_objects.cc",
     "host_mock_objects.h",
-    "setup/mock_oauth_client.cc",
-    "setup/mock_oauth_client.h",
   ]
 
   configs += [ "//remoting/build/config:version" ]
@@ -467,14 +460,15 @@ static_library("test_support") {
   ]
   public_deps = [
     ":host",
+    "//remoting/base:test_support",
     "//third_party/protobuf:protobuf_lite",
   ]
 
   if (enable_webrtc) {
     public_deps += [
-      "//third_party/libjingle/webrtc:libjingle_webrtc",
       "//third_party/libjingle_xmpp",
       "//third_party/webrtc/modules/desktop_capture",
+      "//third_party/webrtc_overrides:init_webrtc",
     ]
   }
 }
@@ -530,7 +524,6 @@ source_set("unit_tests") {
     "screen_resolution_unittest.cc",
     "server_log_entry_host_unittest.cc",
     "setup/me2me_native_messaging_host_unittest.cc",
-    "setup/oauth_helper_unittest.cc",
     "setup/pin_validator_unittest.cc",
     "third_party_auth_config_unittest.cc",
     "token_validator_base_unittest.cc",
@@ -621,13 +614,16 @@ if (enable_remoting_host) {
         "setup/start_host_main.h",
       ]
 
-      deps += [ "//remoting/host/setup" ]
+      deps += [
+        "//google_apis",
+        "//remoting/host/setup",
+      ]
     }
 
     if (enable_webrtc) {
       deps += [
-        "//third_party/libjingle/webrtc:libjingle_webrtc",
         "//third_party/libjingle_xmpp",
+        "//third_party/webrtc_overrides:init_webrtc",
       ]
     }
   }
@@ -729,6 +725,7 @@ if (enable_me2me_host) {
       "//base",
       "//base:i18n",
       "//components/policy/core/common",
+      "//ipc",
       "//net",
       "//remoting/base",
       "//remoting/host",
@@ -742,8 +739,8 @@ if (enable_me2me_host) {
 
     if (enable_webrtc) {
       deps += [
-        "//third_party/libjingle/webrtc:libjingle_webrtc",
         "//third_party/libjingle_xmpp",
+        "//third_party/webrtc_overrides:init_webrtc",
       ]
     }
 
diff --git a/chromium/remoting/host/installer/BUILD.gn b/chromium/remoting/host/installer/BUILD.gn
index 1004128f17f..fc19aa790b7 100644
--- a/chromium/remoting/host/installer/BUILD.gn
+++ b/chromium/remoting/host/installer/BUILD.gn
@@ -11,6 +11,7 @@ action("credits") {
   # be at the same location.
   about_credits_file = "$root_build_dir/gen/remoting/CREDITS.txt"
   script = "//tools/licenses.py"
+  depfile = "$target_gen_dir/$target_name.d"
 
   inputs = [
     "credits.tmpl",
@@ -28,5 +29,7 @@ action("credits") {
     rebase_path("credits.tmpl", root_build_dir),
     "--entry-template",
     rebase_path("credits_entry.tmpl", root_build_dir),
+    "--depfile",
+    rebase_path(depfile, root_build_dir),
   ]
 }
diff --git a/chromium/remoting/host/it2me/BUILD.gn b/chromium/remoting/host/it2me/BUILD.gn
index 49aa142abf9..0908c7496cd 100644
--- a/chromium/remoting/host/it2me/BUILD.gn
+++ b/chromium/remoting/host/it2me/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("//build/config/features.gni")
 import("//media/media_options.gni")
-import("//remoting/remoting_enable.gni")
+import("//remoting/remoting_options.gni")
 import("//remoting/remoting_locales.gni")
 import("//remoting/remoting_version.gni")
 
@@ -227,7 +227,7 @@ if (!is_chromeos && enable_remoting_host) {
       }
 
       if (enable_webrtc) {
-        deps += [ "//third_party/libjingle/webrtc:libjingle_webrtc" ]
+        deps += [ "//third_party/webrtc_overrides:init_webrtc" ]
       }
 
       if (is_desktop_linux) {
diff --git a/chromium/remoting/host/security_key/BUILD.gn b/chromium/remoting/host/security_key/BUILD.gn
index ff462ab14c3..422dd84e87a 100644
--- a/chromium/remoting/host/security_key/BUILD.gn
+++ b/chromium/remoting/host/security_key/BUILD.gn
@@ -36,6 +36,7 @@ source_set("security_key") {
   ]
 
   deps = [
+    "//ipc",
     "//mojo/edk/system",
     "//remoting/proto",
     "//third_party/webrtc/modules/desktop_capture",
@@ -112,6 +113,7 @@ static_library("test_support") {
   ]
 
   deps = [
+    "//ipc",
     "//remoting/proto",
     "//testing/gtest",
   ]
diff --git a/chromium/remoting/host/setup/BUILD.gn b/chromium/remoting/host/setup/BUILD.gn
index d0e992e8032..2f5da09b965 100644
--- a/chromium/remoting/host/setup/BUILD.gn
+++ b/chromium/remoting/host/setup/BUILD.gn
@@ -12,13 +12,8 @@ source_set("setup") {
     "daemon_controller_delegate_mac.mm",
     "daemon_controller_delegate_win.cc",
     "daemon_controller_delegate_win.h",
-    "gaia_oauth_client.cc",
-    "gaia_oauth_client.h",
     "me2me_native_messaging_host.cc",
     "me2me_native_messaging_host.h",
-    "oauth_client.h",
-    "oauth_helper.cc",
-    "oauth_helper.h",
     "pin_validator.cc",
     "pin_validator.h",
     "service_client.cc",
@@ -39,6 +34,7 @@ source_set("setup") {
   deps = [
     "//base",
     "//google_apis",
+    "//remoting/base:authorization",
     "//remoting/host",
     "//remoting/host/native_messaging",
   ]
diff --git a/chromium/remoting/host/win/BUILD.gn b/chromium/remoting/host/win/BUILD.gn
index 80e3a380ffc..4d864c655df 100644
--- a/chromium/remoting/host/win/BUILD.gn
+++ b/chromium/remoting/host/win/BUILD.gn
@@ -116,10 +116,8 @@ source_set("win") {
   deps = [
     "//base:i18n",
     "//components/policy/core/common",
-    "//content/public/common",
     "//crypto",
     "//device/power_save_blocker",
-    "//google_apis",
     "//ipc",
     "//remoting/base",
     "//remoting/host/security_key",
@@ -154,6 +152,7 @@ source_set("unit_tests") {
   ]
 
   deps = [
+    "//ipc",
     "//remoting/host",
     "//remoting/host:test_support",
     "//remoting/host/it2me:common",
@@ -390,7 +389,6 @@ shared_library("remoting_core") {
     "//net",
     "//remoting/base",
     "//remoting/base:breakpad",
-    "//remoting/codec",
     "//remoting/host:host",
     "//remoting/host:remoting_me2me_host_static",
     "//remoting/host/it2me:common",
diff --git a/chromium/remoting/protocol/BUILD.gn b/chromium/remoting/protocol/BUILD.gn
index b6ce9eb370f..edda462fb9c 100644
--- a/chromium/remoting/protocol/BUILD.gn
+++ b/chromium/remoting/protocol/BUILD.gn
@@ -3,19 +3,16 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
+import("//remoting/remoting_options.gni")
 import("//media/media_options.gni")
 
 static_library("protocol") {
   sources = [
     "audio_decode_scheduler.cc",
     "audio_decode_scheduler.h",
-    "audio_pump.cc",
-    "audio_pump.h",
     "audio_reader.cc",
     "audio_reader.h",
     "audio_stub.h",
-    "audio_writer.cc",
-    "audio_writer.h",
     "auth_util.cc",
     "auth_util.h",
     "authenticator.cc",
@@ -185,7 +182,7 @@ static_library("protocol") {
 
   public_deps = [
     "//remoting/proto",
-    "//third_party/libjingle",
+    "//third_party/webrtc_overrides",
   ]
   deps = [
     "//base",
@@ -193,39 +190,22 @@ static_library("protocol") {
     "//jingle:jingle_glue",
     "//net",
     "//remoting/base",
-    "//remoting/codec",
+    "//remoting/codec:decoder",
     "//remoting/signaling",
     "//third_party/boringssl",
     "//third_party/libyuv",
   ]
 
   if (!is_nacl) {
-    if (!is_android) {
-      sources += [
-        "ice_connection_to_client.cc",
-        "ice_connection_to_client.h",
-      ]
-    }
-
     sources += [
-      "capture_scheduler.cc",
-      "capture_scheduler.h",
       "chromium_port_allocator_factory.cc",
       "chromium_port_allocator_factory.h",
       "chromium_socket_factory.cc",
       "chromium_socket_factory.h",
-      "video_frame_pump.cc",
-      "video_frame_pump.h",
       "webrtc_audio_module.cc",
       "webrtc_audio_module.h",
       "webrtc_audio_sink_adapter.cc",
       "webrtc_audio_sink_adapter.h",
-      "webrtc_audio_source_adapter.cc",
-      "webrtc_audio_source_adapter.h",
-      "webrtc_audio_stream.cc",
-      "webrtc_audio_stream.h",
-      "webrtc_connection_to_client.cc",
-      "webrtc_connection_to_client.h",
       "webrtc_connection_to_host.cc",
       "webrtc_connection_to_host.h",
       "webrtc_data_stream_adapter.cc",
@@ -234,29 +214,45 @@ static_library("protocol") {
       "webrtc_dummy_video_capturer.h",
       "webrtc_dummy_video_encoder.cc",
       "webrtc_dummy_video_encoder.h",
-      "webrtc_frame_scheduler.h",
-      "webrtc_frame_scheduler_simple.cc",
-      "webrtc_frame_scheduler_simple.h",
       "webrtc_transport.cc",
       "webrtc_transport.h",
       "webrtc_video_renderer_adapter.cc",
       "webrtc_video_renderer_adapter.h",
-      "webrtc_video_stream.cc",
-      "webrtc_video_stream.h",
     ]
 
-    if (enable_webrtc) {
-      deps += [
-        "//third_party/libjingle/webrtc:libjingle_webrtc",
-        "//third_party/libjingle_xmpp",
-      ]
-    } else {
-      sources -= [
+    if (enable_remoting_host) {
+      sources += [
+        "webrtc_audio_source_adapter.cc",
+        "webrtc_audio_source_adapter.h",
+        "webrtc_audio_stream.cc",
+        "webrtc_audio_stream.h",
         "webrtc_connection_to_client.cc",
-        "webrtc_transport.cc",
+        "webrtc_connection_to_client.h",
+        "webrtc_frame_scheduler.h",
+        "webrtc_frame_scheduler_simple.cc",
+        "webrtc_frame_scheduler_simple.h",
         "webrtc_video_stream.cc",
+        "webrtc_video_stream.h",
       ]
     }
+
+    deps += [ "//third_party/webrtc_overrides:init_webrtc" ]
+  }
+
+  if (enable_remoting_host) {
+    sources += [
+      "audio_pump.cc",
+      "audio_pump.h",
+      "audio_writer.cc",
+      "audio_writer.h",
+      "capture_scheduler.cc",
+      "capture_scheduler.h",
+      "ice_connection_to_client.cc",
+      "ice_connection_to_client.h",
+      "video_frame_pump.cc",
+      "video_frame_pump.h",
+    ]
+    deps += [ "//remoting/codec:encoder" ]
   }
 }
 
@@ -264,18 +260,12 @@ static_library("test_support") {
   testonly = true
 
   sources = [
-    "fake_audio_source.cc",
-    "fake_audio_source.h",
     "fake_authenticator.cc",
     "fake_authenticator.h",
-    "fake_connection_to_client.cc",
-    "fake_connection_to_client.h",
     "fake_connection_to_host.cc",
     "fake_connection_to_host.h",
     "fake_datagram_socket.cc",
     "fake_datagram_socket.h",
-    "fake_desktop_capturer.cc",
-    "fake_desktop_capturer.h",
     "fake_session.cc",
     "fake_session.h",
     "fake_stream_socket.cc",
@@ -286,6 +276,17 @@ static_library("test_support") {
     "protocol_mock_objects.h",
   ]
 
+  if (enable_remoting_host) {
+    sources += [
+      "fake_audio_source.cc",
+      "fake_audio_source.h",
+      "fake_connection_to_client.cc",
+      "fake_connection_to_client.h",
+      "fake_desktop_capturer.cc",
+      "fake_desktop_capturer.h",
+    ]
+  }
+
   public_deps = [
     ":protocol",
     "//testing/gmock",
@@ -297,10 +298,8 @@ source_set("unit_tests") {
 
   sources = [
     "audio_decode_scheduler_unittest.cc",
-    "audio_pump_unittest.cc",
     "authenticator_test_base.cc",
     "authenticator_test_base.h",
-    "capture_scheduler_unittest.cc",
     "channel_multiplexer_unittest.cc",
     "channel_socket_adapter_unittest.cc",
     "chromium_socket_factory_unittest.cc",
@@ -332,14 +331,18 @@ source_set("unit_tests") {
     "third_party_authenticator_unittest.cc",
     "v2_authenticator_unittest.cc",
     "validating_authenticator_unittest.cc",
-    "video_frame_pump_unittest.cc",
-    "webrtc_audio_source_adapter_unittest.cc",
-    "webrtc_frame_scheduler_unittest.cc",
     "webrtc_transport_unittest.cc",
   ]
 
-  if (!is_android) {
-    sources += [ "connection_unittest.cc" ]
+  if (enable_remoting_host) {
+    sources += [
+      "audio_pump_unittest.cc",
+      "capture_scheduler_unittest.cc",
+      "connection_unittest.cc",
+      "video_frame_pump_unittest.cc",
+      "webrtc_audio_source_adapter_unittest.cc",
+      "webrtc_frame_scheduler_unittest.cc",
+    ]
   }
 
   deps = [
diff --git a/chromium/remoting/remoting_enable.gni b/chromium/remoting/remoting_enable.gni
index 0160893bfc4..3b9f45e0082 100644
--- a/chromium/remoting/remoting_enable.gni
+++ b/chromium/remoting/remoting_enable.gni
@@ -3,19 +3,8 @@
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
+import("//media/media_options.gni")
 
 declare_args() {
-  enable_remoting = !is_ios && !is_chromecast
-}
-
-enable_remoting_host = false
-enable_me2me_host = false
-
-if (is_win || (is_linux && !is_chromeos && use_x11) || is_mac) {
-  enable_remoting_host = true
-  enable_me2me_host = true
-}
-
-if (is_linux && is_chromeos) {
-  enable_remoting_host = true
+  enable_remoting = !is_ios && !is_chromecast && enable_webrtc
 }
diff --git a/chromium/remoting/remoting_options.gni b/chromium/remoting/remoting_options.gni
index b3e998bb3c6..afc202bf340 100644
--- a/chromium/remoting/remoting_options.gni
+++ b/chromium/remoting/remoting_options.gni
@@ -3,6 +3,11 @@
 # found in the LICENSE file.
 
 import("//build/config/chrome_build.gni")
+import("//build/config/ui.gni")
+
+enable_remoting_host =
+    is_win || (is_linux && (is_chromeos || use_x11)) || is_mac
+enable_me2me_host = is_win || (is_linux && !is_chromeos && use_x11) || is_mac
 
 # These arguments can be overridden from the command line (see "gn help args").
 declare_args() {
diff --git a/chromium/remoting/remoting_version.gni b/chromium/remoting/remoting_version.gni
index 8a0df67463f..3dad3af4f54 100644
--- a/chromium/remoting/remoting_version.gni
+++ b/chromium/remoting/remoting_version.gni
@@ -45,6 +45,13 @@ if (is_mac) {
   _template += "uninstaller_bundle_id = \"@MAC_UNINSTALLER_BUNDLE_ID@\""
 }
 
+if (is_ios) {
+  _template += "ios_bundle_id = \"@IOS_BUNDLE_ID@\""
+  _template += "ios_display_name = \"@IOS_DISPLAY_NAME@\""
+  _template += "ios_exec_name = \"@IOS_EXEC_NAME@\""
+  _template += "ios_product_name = \"@IOS_PRODUCT_NAME@\""
+}
+
 _result = exec_script(_version_py_abspath,
                       [
                         "-f",
@@ -89,3 +96,10 @@ if (is_mac) {
                   [ "$host_uninstaller_name" ],
                   "trim string")
 }
+
+if (is_ios) {
+  remoting_ios_bundle_id = _result.ios_bundle_id
+  remoting_ios_display_name = _result.ios_display_name
+  remoting_ios_executable_name = _result.ios_exec_name
+  remoting_ios_product_name = _result.ios_product_name
+}
diff --git a/chromium/remoting/signaling/BUILD.gn b/chromium/remoting/signaling/BUILD.gn
index 324f39dd99b..ac5a2aac166 100644
--- a/chromium/remoting/signaling/BUILD.gn
+++ b/chromium/remoting/signaling/BUILD.gn
@@ -34,8 +34,8 @@ static_library("signaling") {
 
   public_deps = [
     "//remoting/proto",
-    "//third_party/libjingle",
     "//third_party/libjingle_xmpp",
+    "//third_party/webrtc_overrides",
   ]
 
   deps = [
diff --git a/chromium/remoting/test/BUILD.gn b/chromium/remoting/test/BUILD.gn
index f6525c94f44..18dc5f1102a 100644
--- a/chromium/remoting/test/BUILD.gn
+++ b/chromium/remoting/test/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//remoting/remoting_enable.gni")
+import("//remoting/remoting_options.gni")
 
 static_library("test_support") {
   testonly = true
@@ -73,7 +73,8 @@ static_library("test_support") {
     "//net",
     "//remoting/base",
     "//remoting/client",
-    "//remoting/codec",
+    "//remoting/codec:decoder",
+    "//remoting/codec:encoder",
     "//remoting/protocol",
     "//remoting/signaling",
     "//third_party/webrtc/modules/desktop_capture",
@@ -85,7 +86,7 @@ static_library("test_support") {
     "//skia",
     "//testing/gmock",
     "//testing/gtest",
-    "//third_party/libjingle",
+    "//third_party/webrtc_overrides",
   ]
 }
 
diff --git a/chromium/remoting/webapp/BUILD.gn b/chromium/remoting/webapp/BUILD.gn
index 91fc4c12b9f..b80474e2200 100644
--- a/chromium/remoting/webapp/BUILD.gn
+++ b/chromium/remoting/webapp/BUILD.gn
@@ -11,6 +11,7 @@ import("//remoting/webapp/files.gni")
 action("credits") {
   about_credits_file = "$target_gen_dir/credits.html"
   script = "//tools/licenses.py"
+  depfile = "$target_gen_dir/$target_name.d"
 
   inputs = [
     "base/html/credits.tmpl",
@@ -28,6 +29,8 @@ action("credits") {
     rebase_path("base/html/credits.tmpl", root_build_dir),
     "--entry-template",
     rebase_path("base/html/credits_entry.tmpl", root_build_dir),
+    "--depfile",
+    rebase_path(depfile, root_build_dir),
   ]
 }
 
diff --git a/chromium/remoting/webapp/files.gni b/chromium/remoting/webapp/files.gni
index abb6b280a8f..f2e55cdaf62 100644
--- a/chromium/remoting/webapp/files.gni
+++ b/chromium/remoting/webapp/files.gni
@@ -423,6 +423,7 @@ remoting_webapp_background_html_js_files = [
   "crd/js/activation_handler.js",
   "crd/js/app_launcher.js",
   "crd/js/background.js",
+  "crd/js/options_export.js",
 ]
 
 # All the JavaScript files required by background.html.