BASELINE: Update Chromium to 62.0.3202.101

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

24 files changed, 205 insertions, 183 deletions

diff --git a/chromium/remoting/BUILD.gn b/chromium/remoting/BUILD.gn
index 3f64988626f..8c908582a3b 100644
--- a/chromium/remoting/BUILD.gn
+++ b/chromium/remoting/BUILD.gn
@@ -153,6 +153,7 @@ test("remoting_unittests") {
     "//google_apis",
     "//remoting/base:unit_tests",
     "//remoting/client:unit_tests",
+    "//remoting/client/audio:unit_tests",
     "//remoting/client/display:unit_tests",
     "//remoting/client/input:unit_tests",
     "//remoting/client/ui:unit_tests",
diff --git a/chromium/remoting/android/BUILD.gn b/chromium/remoting/android/BUILD.gn
index fdb35cbd6eb..e4d49ab7c6d 100644
--- a/chromium/remoting/android/BUILD.gn
+++ b/chromium/remoting/android/BUILD.gn
@@ -59,7 +59,7 @@ android_resources("remoting_android_client_java_resources") {
 }
 
 remoting_android_client_java_tmpl("remoting_android_client_java") {
-  remoting_google_play_services_library = google_play_services_library
+  play_services_package = "//third_party/android_tools"
 }
 
 remoting_apk_tmpl("remoting_apk") {
diff --git a/chromium/remoting/android/client_java_tmpl.gni b/chromium/remoting/android/client_java_tmpl.gni
index 27e43265864..2da32881f50 100644
--- a/chromium/remoting/android/client_java_tmpl.gni
+++ b/chromium/remoting/android/client_java_tmpl.gni
@@ -79,6 +79,7 @@ template("remoting_android_client_java_tmpl") {
     deps = [
       "//base:base_java",
       "//remoting/android:remoting_android_client_java_resources",
+      "//remoting/android:remoting_apk_manifest",
       "//third_party/android_tools:android_support_annotations_java",
       "//third_party/android_tools:android_support_compat_java",
       "//third_party/android_tools:android_support_core_ui_java",
@@ -87,6 +88,20 @@ template("remoting_android_client_java_tmpl") {
       "//ui/android:ui_utils_java",
     ]
 
-    deps += [ invoker.remoting_google_play_services_library ]
+    if (defined(invoker.play_services_package)) {
+      deps += [
+        "${invoker.play_services_package}:google_play_services_auth_base_java",
+        "${invoker.play_services_package}:google_play_services_base_java",
+        "${invoker.play_services_package}:google_play_services_basement_java",
+      ]
+    }
+
+    # TODO(agrieve): Convert downstream to use play_services_package.
+    if (defined(invoker.remoting_google_play_services_library)) {
+      deps += [ invoker.remoting_google_play_services_library ]
+    }
+
+    # Manifest used for linting (determining unused resources).
+    android_manifest = "$root_gen_dir/remoting/android/AndroidManifest.xml"
   }
 }
diff --git a/chromium/remoting/base/BUILD.gn b/chromium/remoting/base/BUILD.gn
index ec25bfaa751..7f5a8b9e07b 100644
--- a/chromium/remoting/base/BUILD.gn
+++ b/chromium/remoting/base/BUILD.gn
@@ -71,7 +71,6 @@ source_set("base") {
     sources -= [
       "chromium_url_request.cc",
       "chromoting_event.cc",
-      "service_urls.cc",
       "telemetry_log_writer.cc",
       "url_request_context_getter.cc",
     ]
diff --git a/chromium/remoting/client/BUILD.gn b/chromium/remoting/client/BUILD.gn
index 2a283c064a0..6192de7c63e 100644
--- a/chromium/remoting/client/BUILD.gn
+++ b/chromium/remoting/client/BUILD.gn
@@ -4,10 +4,6 @@
 
 static_library("client") {
   sources = [
-    "audio_player.cc",
-    "audio_player.h",
-    "audio_player_android.cc",
-    "audio_player_android.h",
     "chromoting_client.cc",
     "chromoting_client.h",
     "chromoting_session.cc",
@@ -41,6 +37,7 @@ static_library("client") {
 
   deps = [
     "//remoting/base",
+    "//remoting/client/audio",
     "//remoting/codec:decoder",
     "//remoting/protocol",
     "//third_party/libyuv",
@@ -66,20 +63,14 @@ static_library("client") {
     ]
   }
   if (is_android) {
-    libs += [
-      "android",
-      "OpenSLES",
-    ]
+    libs += [ "android" ]
   }
 }
 
 source_set("unit_tests") {
   testonly = true
 
-  # Disabled the source filters because there are _mac files that need to
-  # be compiled on all platforms.
   sources = [
-    "audio_player_unittest.cc",
     "chromoting_client_runtime_unittest.cc",
     "client_telemetry_logger_unittest.cc",
     "dual_buffer_frame_consumer_unittest.cc",
diff --git a/chromium/remoting/client/audio/BUILD.gn b/chromium/remoting/client/audio/BUILD.gn
new file mode 100644
index 00000000000..95fea34a2a9
--- /dev/null
+++ b/chromium/remoting/client/audio/BUILD.gn
@@ -0,0 +1,48 @@
+# 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.
+
+source_set("audio") {
+  sources = [
+    "async_audio_frame_supplier.h",
+    "audio_frame_supplier.h",
+    "audio_player.cc",
+    "audio_player.h",
+    "audio_player_android.cc",
+    "audio_player_android.h",
+    "audio_stream_consumer.h",
+  ]
+
+  configs += [ "//remoting/build/config:version" ]
+
+  deps = [
+    "//base",
+    "//remoting/base",
+  ]
+
+  libs = []
+
+  if (is_android) {
+    libs += [
+      "android",
+      "OpenSLES",
+    ]
+  }
+}
+
+source_set("unit_tests") {
+  testonly = true
+
+  sources = [
+    "audio_player_unittest.cc",
+  ]
+
+  configs += [ "//remoting/build/config:version" ]
+
+  deps = [
+    ":audio",
+    "//remoting/proto",
+    "//testing/gmock",
+    "//testing/gtest",
+  ]
+}
diff --git a/chromium/remoting/client/input/BUILD.gn b/chromium/remoting/client/input/BUILD.gn
index 60d527a70eb..b7a4367c59e 100644
--- a/chromium/remoting/client/input/BUILD.gn
+++ b/chromium/remoting/client/input/BUILD.gn
@@ -54,8 +54,8 @@ source_set("normalizing_input_filter") {
 
   deps = [
     "//remoting/base",
-    "//third_party/webrtc/rtc_base:rtc_base_approved",
     "//third_party/webrtc/modules/desktop_capture:primitives",
+    "//third_party/webrtc/rtc_base:rtc_base_approved",
     "//ui/events:dom_keycode_converter",
   ]
 }
diff --git a/chromium/remoting/client/jni/BUILD.gn b/chromium/remoting/client/jni/BUILD.gn
index 6f1092608a8..bc665fbbbac 100644
--- a/chromium/remoting/client/jni/BUILD.gn
+++ b/chromium/remoting/client/jni/BUILD.gn
@@ -40,8 +40,6 @@ shared_library("remoting_client_jni") {
     "jni_touch_event_data.cc",
     "jni_touch_event_data.h",
     "remoting_jni_onload.cc",
-    "remoting_jni_registrar.cc",
-    "remoting_jni_registrar.h",
   ]
   libs = [
     "android",
diff --git a/chromium/remoting/client/plugin/BUILD.gn b/chromium/remoting/client/plugin/BUILD.gn
index a5fc3dff4df..763a7450d4e 100644
--- a/chromium/remoting/client/plugin/BUILD.gn
+++ b/chromium/remoting/client/plugin/BUILD.gn
@@ -49,6 +49,7 @@ executable("remoting_client_plugin_newlib") {
     "//ppapi/native_client:ppapi_lib",
     "//remoting/base",
     "//remoting/client",
+    "//remoting/client/audio",
     "//remoting/client/input",
     "//remoting/protocol",
     "//remoting/signaling",
diff --git a/chromium/remoting/codec/BUILD.gn b/chromium/remoting/codec/BUILD.gn
index 1eee9580525..e463e2e6cf5 100644
--- a/chromium/remoting/codec/BUILD.gn
+++ b/chromium/remoting/codec/BUILD.gn
@@ -36,6 +36,19 @@ source_set("encoder") {
     "//ui/gfx:color_space",
   ]
 
+  # Currently, building WebrtcVideoEncoderGpu is only supported on Windows and
+  # Linux, and encoding with WebrtcVideoEncoderGpu is only supported on Windows.
+  if (is_win || is_linux) {
+    sources += [
+      "webrtc_video_encoder_gpu.cc",
+      "webrtc_video_encoder_gpu.h",
+    ]
+    deps += [
+      "//gpu/command_buffer/service",
+      "//media/gpu",
+    ]
+  }
+
   # 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.
diff --git a/chromium/remoting/host/BUILD.gn b/chromium/remoting/host/BUILD.gn
index 887d1ad4b42..06564d7a373 100644
--- a/chromium/remoting/host/BUILD.gn
+++ b/chromium/remoting/host/BUILD.gn
@@ -135,6 +135,15 @@ static_library("host") {
     "disconnect_window_win.cc",
     "dns_blackhole_checker.cc",
     "dns_blackhole_checker.h",
+    "evaluate_capability.cc",
+    "evaluate_capability.h",
+    "file_proxy_wrapper.cc",
+    "file_proxy_wrapper.h",
+    "file_proxy_wrapper_linux.cc",
+    "file_proxy_wrapper_mac.cc",
+    "file_proxy_wrapper_win.cc",
+    "file_transfer_message_handler.cc",
+    "file_transfer_message_handler.h",
     "forward_process_stats_agent.cc",
     "forward_process_stats_agent.h",
     "gcd_rest_client.cc",
@@ -149,7 +158,6 @@ static_library("host") {
     "host_change_notification_listener.h",
     "host_config.cc",
     "host_config.h",
-    "host_config_constants.cc",
     "host_details.cc",
     "host_details.h",
     "host_event_logger.h",
@@ -455,6 +463,8 @@ source_set("unit_tests") {
     "daemon_process_unittest.cc",
     "desktop_process_unittest.cc",
     "desktop_session_agent_unittest.cc",
+    "file_proxy_wrapper_linux_unittest.cc",
+    "file_transfer_message_handler_unittest.cc",
     "gcd_rest_client_unittest.cc",
     "gcd_state_updater_unittest.cc",
     "heartbeat_sender_unittest.cc",
@@ -532,6 +542,11 @@ source_set("unit_tests") {
   if (!is_ios) {
     deps += [ "//components/policy/core/browser:test_support" ]
   }
+
+  if (enable_me2me_host) {
+    sources += [ "evaluate_capability_unittest.cc" ]
+    data_deps = [ "//remoting/test:capability_test_stub" ]
+  }
 }
 
 group("remoting_host_branded") {
@@ -646,7 +661,6 @@ if (enable_remoting_host) {
     sources = [
       "installer/mac/uninstaller/remoting_uninstaller-InfoPlist.strings.jinja2",
       "it2me/remote_assistance_host-InfoPlist.strings.jinja2",
-      "mac/me2me_preference_pane-InfoPlist.strings.jinja2",
       "remoting_me2me_host-InfoPlist.strings.jinja2",
       "setup/native_messaging_host-InfoPlist.strings.jinja2",
     ]
diff --git a/chromium/remoting/host/installer/mac/BUILD.gn b/chromium/remoting/host/installer/mac/BUILD.gn
index 973d20dbbf7..8e131a72b2e 100644
--- a/chromium/remoting/host/installer/mac/BUILD.gn
+++ b/chromium/remoting/host/installer/mac/BUILD.gn
@@ -45,7 +45,6 @@ action("remoting_me2me_host_archive") {
            "--source-files",
          ] + rebase_path(_installer_mac_files, root_build_dir) + [
            "--generated-files",
-           "remoting_host_prefpane.prefPane",
            "remoting_me2me_host.app",
            "native_messaging_host.app",
            "remote_assistance_host.app",
@@ -53,7 +52,6 @@ action("remoting_me2me_host_archive") {
            "remoting/com.google.chrome.remote_desktop.json",
            "remoting/com.google.chrome.remote_assistance.json",
            "--generated-files-dst",
-           "PreferencePanes/$prefpane_bundle_name",
            "PrivilegedHelperTools/$host_bundle_name",
            "PrivilegedHelperTools/$host_bundle_name/Contents/MacOS/$native_messaging_host_bundle_name",
            "PrivilegedHelperTools/$host_bundle_name/Contents/MacOS/$remote_assistance_host_bundle_name",
@@ -79,7 +77,6 @@ action("remoting_me2me_host_archive") {
            "DMG_FILE_NAME=$host_name_nospace-$chrome_version_full",
            "NATIVE_MESSAGING_HOST_BUNDLE_NAME=$native_messaging_host_bundle_name",
            "REMOTE_ASSISTANCE_HOST_BUNDLE_NAME=$remote_assistance_host_bundle_name",
-           "PREFPANE_BUNDLE_NAME=$prefpane_bundle_name",
          ]
 
   deps = [
@@ -88,7 +85,6 @@ action("remoting_me2me_host_archive") {
     "//remoting/host:remoting_native_messaging_host",
     "//remoting/host:remoting_native_messaging_manifests",
     "//remoting/host/it2me:remote_assistance_host",
-    "//remoting/host/mac:remoting_host_prefpane.prefPane",
   ]
 }
 
diff --git a/chromium/remoting/host/installer/win/BUILD.gn b/chromium/remoting/host/installer/win/BUILD.gn
index 08908831142..74392346650 100644
--- a/chromium/remoting/host/installer/win/BUILD.gn
+++ b/chromium/remoting/host/installer/win/BUILD.gn
@@ -4,8 +4,6 @@
 
 import("//remoting/build/config/remoting_build.gni")
 import("//remoting/host/installer/win/generate_clsids.gni")
-import("//build/toolchain/win/midl.gni")
-import("//build/win/message_compiler.gni")
 
 action("remoting_me2me_host_archive") {
   script = "//remoting/host/installer/build-installer-archive.py"
diff --git a/chromium/remoting/host/mac/BUILD.gn b/chromium/remoting/host/mac/BUILD.gn
index 324bb4f4495..81c434ec213 100644
--- a/chromium/remoting/host/mac/BUILD.gn
+++ b/chromium/remoting/host/mac/BUILD.gn
@@ -5,17 +5,16 @@
 import("//remoting/build/config/remoting_build.gni")
 
 source_set("constants") {
-  defines = [
-    "HOST_BUNDLE_NAME=\"" + host_bundle_name + "\"",
-    "PREFPANE_BUNDLE_NAME=\"" + prefpane_bundle_name + "\"",
-  ]
+  defines = [ "HOST_BUNDLE_NAME=\"" + host_bundle_name + "\"" ]
 
   sources = [
     "constants_mac.cc",
     "constants_mac.h",
   ]
 
-  deps = [ "//remoting/host:remoting_version" ]
+  deps = [
+    "//remoting/host:remoting_version",
+  ]
 }
 
 # remoting_me2me_host-InfoPlist.strings
@@ -97,25 +96,6 @@ target("mac_app_bundle", "remoting_me2me_host") {
   ]
 }
 
-create_bundle("remoting_host_prefpane.prefPane") {
-  bundle_root_dir = "$root_build_dir/$target_name/Contents"
-  bundle_resources_dir = bundle_root_dir + "/Resources"
-  bundle_executable_dir = bundle_root_dir + "/MacOS"
-
-  deps = [
-    ":remoting_host_prefpane",
-    ":remoting_host_prefpane_bundle_data",
-    ":remoting_host_prefpane_plist_bundle_data",
-    ":remoting_host_prefpane_resources",
-    ":remoting_host_prefpane_xibs",
-    "//remoting/host:remoting_infoplist_strings",
-  ]
-
-  foreach(locale, remoting_locales_with_underscores) {
-    deps += [ ":remoting_host_prefpane_strings_${locale}_bundle_data" ]
-  }
-}
-
 foreach(locale, remoting_locales_with_underscores) {
   bundle_data("remoting_host_locale_${locale}_bundle_data") {
     sources = [
@@ -130,28 +110,6 @@ foreach(locale, remoting_locales_with_underscores) {
   }
 }
 
-bundle_data("remoting_host_prefpane_bundle_data") {
-  deps = [
-    ":remoting_host_prefpane",
-  ]
-  sources = [
-    "$root_build_dir/gen/remoting/host/remoting_host_prefpane",
-  ]
-  outputs = [
-    "{{bundle_executable_dir}}/{{source_file_part}}",
-  ]
-}
-
-bundle_data("remoting_host_prefpane_resources") {
-  sources = [
-    "//remoting/resources/chromoting128.png",
-  ]
-
-  outputs = [
-    "{{bundle_resources_dir}}/{{source_file_part}}",
-  ]
-}
-
 # native_messaging_host-InfoPlist.strings
 foreach(locale, remoting_locales_with_underscores) {
   bundle_data("native_messaging_host_strings_${locale}_bundle_data") {
@@ -167,6 +125,21 @@ foreach(locale, remoting_locales_with_underscores) {
   }
 }
 
+bundle_data("remoting_native_messaging_host_resources") {
+  sources = [
+    # This image is used to badge the lock icon in the authentication dialogs,
+    # used for elevating privileges to set up the host. The exact filename is
+    # required by base::mac::GetAuthorizationRightsWithPrompt().
+    # It needs to exist as a file on disk and not just something in a
+    # resource bundle because that's the interface that Authorization Services
+    # uses. Also, Authorization Services can't deal with .icns files.
+    "//remoting/resources/product_logo_32.png",
+  ]
+  outputs = [
+    "{{bundle_resources_dir}}/{{source_file_part}}",
+  ]
+}
+
 target("mac_app_bundle", "remoting_native_messaging_host") {
   output_name = "native_messaging_host"
   info_plist = "../setup/native_messaging_host-Info.plist"
@@ -185,6 +158,7 @@ target("mac_app_bundle", "remoting_native_messaging_host") {
   ]
 
   deps = [
+    ":remoting_native_messaging_host_resources",
     "//base",
     "//net",
     "//remoting/base:breakpad",
@@ -208,79 +182,3 @@ target("mac_app_bundle", "remoting_native_messaging_host") {
       [ "VERSION=" + "$chrome_version_major" + "." + "$remoting_version_patch" +
         "." + "$chrome_version_build" + "." + "$chrome_version_patch" ]
 }
-
-loadable_module("remoting_host_prefpane") {
-  output_dir = "$root_out_dir/gen/remoting/host"
-  output_extension = ""
-
-  sources = [
-    "me2me_preference_pane.h",
-    "me2me_preference_pane.mm",
-    "me2me_preference_pane_confirm_pin.h",
-    "me2me_preference_pane_confirm_pin.mm",
-    "me2me_preference_pane_disable.h",
-    "me2me_preference_pane_disable.mm",
-  ]
-
-  libs = [
-    "Cocoa.framework",
-    "CoreFoundation.framework",
-    "PreferencePanes.framework",
-    "Security.framework",
-  ]
-
-  deps = [
-    ":constants",
-    "//remoting/base",
-    "//remoting/host:host",
-    "//remoting/host:remoting_infoplist_strings",
-    "//remoting/resources:copy_locales",
-    "//third_party/jsoncpp",
-  ]
-  foreach(locale, remoting_locales_with_underscores) {
-    deps += [ ":remoting_host_prefpane_strings_${locale}_bundle_data" ]
-  }
-}
-
-mac_info_plist("remoting_host_prefpane_plist") {
-  info_plist = "me2me_preference_pane-Info.plist"
-  extra_substitutions = [
-    "BUNDLE_ID=$prefpane_bundle_id",
-    "VERSION_FULL=$remoting_version_full",
-    "VERSION_SHORT=$remoting_version_short",
-    "MACOSX_DEPLOYMENT_TARGET=10.7",
-  ]
-  executable_name = "remoting_host_prefpane"
-}
-
-bundle_data("remoting_host_prefpane_plist_bundle_data") {
-  sources = get_target_outputs(":remoting_host_prefpane_plist")
-  outputs = [
-    "{{bundle_root_dir}}/Info.plist",
-  ]
-  public_deps = [
-    ":remoting_host_prefpane_plist",
-  ]
-}
-
-foreach(locale, remoting_locales_with_underscores) {
-  bundle_data("remoting_host_prefpane_strings_${locale}_bundle_data") {
-    sources = [
-      "$root_gen_dir/remoting/host/me2me_preference_pane-InfoPlist.strings/$locale.lproj/InfoPlist.strings",
-    ]
-    outputs = [
-      "{{bundle_resources_dir}}/$locale.lproj/{{source_file_part}}",
-    ]
-    deps = [
-      "//remoting/host:remoting_infoplist_strings",
-    ]
-  }
-}
-
-mac_xib_bundle_data("remoting_host_prefpane_xibs") {
-  sources = [
-    "me2me_preference_pane.xib",
-    "me2me_preference_pane_confirm_pin.xib",
-    "me2me_preference_pane_disable.xib",
-  ]
-}
diff --git a/chromium/remoting/host/win/BUILD.gn b/chromium/remoting/host/win/BUILD.gn
index ffb557c4dca..5b4b5d2a17e 100644
--- a/chromium/remoting/host/win/BUILD.gn
+++ b/chromium/remoting/host/win/BUILD.gn
@@ -37,7 +37,6 @@ windows_manifest("dpi_aware_exe_manifest") {
     default_compatibility_manifest,
     dpi_aware_manifest,
   ]
-  type = "exe"
 }
 
 # Depending on this target gives a default executable manifest with the addition
@@ -49,7 +48,6 @@ windows_manifest("dpi_aware_elevated_exe_manifest") {
     dpi_aware_manifest,
     require_administrator_manifest,
   ]
-  type = "exe"
 }
 
 # Depending on this target gives the executable a default manifest with the
@@ -61,7 +59,6 @@ windows_manifest("dpi_aware_uiaccess_exe_manifest") {
     dpi_aware_manifest,
     enable_uiaccess_manifest,
   ]
-  type = "exe"
 }
 
 # Depending on this target gives the executable a default manifest with the
@@ -73,7 +70,6 @@ windows_manifest("dpi_aware_uiaccess_require_admin_exe_manifest") {
     dpi_aware_manifest,
     enable_uiaccess_require_admin_manifest,
   ]
-  type = "exe"
 }
 
 source_set("win") {
@@ -85,6 +81,8 @@ source_set("win") {
     "com_security.h",
     "default_audio_device_change_detector.cc",
     "default_audio_device_change_detector.h",
+    "evaluate_d3d.cc",
+    "evaluate_d3d.h",
     "launch_process_with_token.cc",
     "launch_process_with_token.h",
     "omaha.cc",
diff --git a/chromium/remoting/ios/app/BUILD.gn b/chromium/remoting/ios/app/BUILD.gn
index 56e87cb04bd..720bd3d47ff 100644
--- a/chromium/remoting/ios/app/BUILD.gn
+++ b/chromium/remoting/ios/app/BUILD.gn
@@ -13,20 +13,6 @@ group("all") {
   ]
 }
 
-foreach(locale, remoting_locales_with_underscores) {
-  bundle_data("locale_${locale}_bundle_data") {
-    sources = [
-      "$root_out_dir/remoting/resources/$locale.lproj/locale.pak",
-    ]
-    outputs = [
-      "{{bundle_resources_dir}}/$locale.lproj/{{source_file_part}}",
-    ]
-    public_deps = [
-      "//remoting/resources:copy_locales",
-    ]
-  }
-}
-
 # source set to be used by both external and internal app.
 source_set("common_source_set") {
   sources = [
@@ -63,6 +49,8 @@ source_set("common_source_set") {
     "host_view_controller.h",
     "host_view_controller.mm",
     "main.mm",
+    "physical_keyboard_detector.h",
+    "physical_keyboard_detector.mm",
     "pin_entry_view.h",
     "pin_entry_view.mm",
     "remoting_theme.h",
@@ -100,7 +88,7 @@ source_set("common_source_set") {
   ]
 
   foreach(locale, remoting_locales_with_underscores) {
-    deps += [ ":locale_${locale}_bundle_data" ]
+    deps += [ "//remoting/ios/app/resources:locale_${locale}_bundle_data" ]
   }
 
   public_deps = [
diff --git a/chromium/remoting/ios/app/remoting_ios_tmpl.gni b/chromium/remoting/ios/app/remoting_ios_tmpl.gni
index 1de62071707..212880d1885 100644
--- a/chromium/remoting/ios/app/remoting_ios_tmpl.gni
+++ b/chromium/remoting/ios/app/remoting_ios_tmpl.gni
@@ -9,11 +9,6 @@ import("//build/util/process_version.gni")
 import("//remoting/build/config/remoting_build.gni")
 import("//remoting/credits/credits.gni")
 
-# TODO(yuweih): Temporary flag. Remove once it rolls into downstream.
-declare_args() {
-  supports_app_initializer = true
-}
-
 _remoting_ios_app_source_dir = get_path_info("./", "abspath")
 
 # Arguments
@@ -87,7 +82,6 @@ template("ios_remoting_app_tmpl") {
       "BUNDLE_IDENTIFIER=$bundle_id",
       "DISPLAY_NAME=$remoting_ios_display_name",
       "EXECUTABLE_NAME=$output_name",
-      "MINIMUM_OS_VERSION=7.0",
       "PRODUCT_NAME=$output_name",
       "VERSION_FULL=$remoting_version_full",
       "VERSION_SHORT=$remoting_version_short",
diff --git a/chromium/remoting/ios/app/resources/BUILD.gn b/chromium/remoting/ios/app/resources/BUILD.gn
index 71f593c5513..6778cd907f1 100644
--- a/chromium/remoting/ios/app/resources/BUILD.gn
+++ b/chromium/remoting/ios/app/resources/BUILD.gn
@@ -3,9 +3,10 @@
 # found in the LICENSE file.
 
 import("//build/config/chrome_build.gni")
-import("//build/config/ios/imageset.gni")
+import("//build/config/ios/asset_catalog.gni")
 import("//build/config/ios/rules.gni")
 import("//remoting/build/config/remoting_build.gni")
+import("//remoting/remoting_locales.gni")
 
 group("assets") {
   public_deps = [
@@ -91,3 +92,52 @@ bundle_data("remoting_icons") {
     "{{bundle_resources_dir}}/{{source_file_part}}",
   ]
 }
+
+# i18n
+
+action("infoplist_strings") {
+  _source = "InfoPlist.strings.jinja2"
+  sources = [
+    _source,
+  ]
+
+  script = "//remoting/tools/build/remoting_localize.py"
+  args = [
+           "--locale_dir",
+           rebase_path(webapp_locale_dir, root_build_dir),
+           "--variables",
+           rebase_path(branding_path, root_build_dir),
+           "--template",
+           rebase_path(_source, root_build_dir),
+           "--locale_output",
+           rebase_path(
+               "$root_gen_dir/remoting/ios/app/InfoPlist_Strings/@{json_suffix}.lproj/InfoPlist.strings",
+               root_build_dir),
+         ] + remoting_locales_with_underscores
+
+  outputs = []
+  foreach(locale, remoting_locales_with_underscores) {
+    outputs += [ "$root_gen_dir/remoting/ios/app/InfoPlist_Strings/$locale.lproj/InfoPlist.strings" ]
+  }
+
+  deps = [
+    "//remoting/resources",
+    "//remoting/resources:strings",
+  ]
+}
+
+foreach(locale, remoting_locales_with_underscores) {
+  bundle_data("locale_${locale}_bundle_data") {
+    sources = [
+      "$root_gen_dir/remoting/ios/app/InfoPlist_Strings/$locale.lproj/InfoPlist.strings",
+      "$root_out_dir/remoting/resources/$locale.lproj/locale.pak",
+    ]
+    outputs = [
+      "{{bundle_resources_dir}}/$locale.lproj/{{source_file_part}}",
+    ]
+    public_deps = [
+      ":infoplist_strings",
+      "//remoting/resources:copy_locales",
+    ]
+  }
+}
diff --git a/chromium/remoting/proto/BUILD.gn b/chromium/remoting/proto/BUILD.gn
index b1c520aaf3a..99b0f3be819 100644
--- a/chromium/remoting/proto/BUILD.gn
+++ b/chromium/remoting/proto/BUILD.gn
@@ -16,6 +16,7 @@ proto_library("proto") {
     "audio.proto",
     "control.proto",
     "event.proto",
+    "file_transfer.proto",
     "internal.proto",
     "mux.proto",
     "process_stats.proto",
diff --git a/chromium/remoting/protocol/BUILD.gn b/chromium/remoting/protocol/BUILD.gn
index b38627d087c..1667a8beab8 100644
--- a/chromium/remoting/protocol/BUILD.gn
+++ b/chromium/remoting/protocol/BUILD.gn
@@ -48,9 +48,9 @@ static_library("protocol") {
     "connection_to_host.h",
     "content_description.cc",
     "content_description.h",
-    "datagram_channel_factory.h",
     "data_channel_manager.cc",
     "data_channel_manager.h",
+    "datagram_channel_factory.h",
     "errors.cc",
     "errors.h",
     "frame_consumer.h",
diff --git a/chromium/remoting/remoting_locales.gni b/chromium/remoting/remoting_locales.gni
index 3dfd0a3047a..42e949d1e9b 100644
--- a/chromium/remoting/remoting_locales.gni
+++ b/chromium/remoting/remoting_locales.gni
@@ -22,7 +22,6 @@ remoting_locales = [
   "et",
 
   "fa",
-  "fake-bidi",
   "fi",
   "fil",
   "fr",
@@ -72,7 +71,6 @@ remoting_locales_with_underscores = remoting_locales
 remoting_locales_with_underscores -= [
   "en-GB",
 
-  "fake-bidi",
   "pt-PT",
   "zh-CN",
   "zh-TW",
@@ -80,14 +78,21 @@ remoting_locales_with_underscores -= [
 remoting_locales_with_underscores += [
   "en_GB",
 
-  "fake_bidi",
   "pt_PT",
   "zh_CN",
   "zh_TW",
 ]
 
+if (!is_official_build) {
+  remoting_locales += [ "fake-bidi" ]
+  remoting_locales_with_underscores += [ "fake_bidi" ]
+}
+
 # An additional locale "en-US" is generated for ChromeOS and Chrome on iOS.
-if (is_chromeos || is_ios) {
+# TODO(yuweih): Our build script doesn't seem to work with en-US and Chrome
+# on iOS doesn't seem to have en-US.lproj. Add is_ios back if we do need to
+# work with en-US.
+if (is_chromeos) {
   remoting_locales += [ "en-US" ]
   remoting_locales_with_underscores += [ "en_US" ]
 }
diff --git a/chromium/remoting/remoting_version.gni b/chromium/remoting/remoting_version.gni
index 3dad3af4f54..825c97ff067 100644
--- a/chromium/remoting/remoting_version.gni
+++ b/chromium/remoting/remoting_version.gni
@@ -29,7 +29,6 @@ _template = "mac_host_bundle = \"@MAC_HOST_BUNDLE_NAME@\" "
 _template +=
     "mac_native_messaging_bundle = \"@MAC_NATIVE_MESSAGING_HOST_BUNDLE_NAME@\" "
 _template += "mac_remote_assistance_bundle = \"@MAC_REMOTE_ASSISTANCE_HOST_BUNDLE_NAME@\" "
-_template += "prefpane_bundle_name = \"@MAC_PREFPANE_BUNDLE_NAME@\" "
 _template += "host_bundle_name = \"@MAC_HOST_BUNDLE_NAME@\" "
 _template += "host_name= \"@MAC_HOST_PACKAGE_NAME@\" "
 _template += "host_service_name = \"@DAEMON_FILE_NAME@\" "
@@ -40,7 +39,6 @@ _template += "version_patch = \"@REMOTING_PATCH@\" "
 if (is_mac) {
   _template += "host_bundle_id = \"@MAC_HOST_BUNDLE_ID@\" "
   _template += "native_messaging_host_bundle_id = \"@MAC_NATIVE_MESSAGING_HOST_BUNDLE_ID@\""
-  _template += "prefpane_bundle_id = \"@MAC_PREFPANE_BUNDLE_ID@\" "
   _template += "remote_assistance_host_bundle_id = \"@MAC_REMOTE_ASSISTANCE_HOST_BUNDLE_ID@\" "
   _template += "uninstaller_bundle_id = \"@MAC_UNINSTALLER_BUNDLE_ID@\""
 }
@@ -64,7 +62,6 @@ _result = exec_script(_version_py_abspath,
                       "scope",
                       remoting_version_files)
 
-prefpane_bundle_name = _result.prefpane_bundle_name
 host_bundle_name = _result.host_bundle_name
 host_name = _result.host_name
 host_service_name = _result.host_service_name
@@ -81,7 +78,6 @@ remoting_version_full = "$remoting_version_short.$chrome_version_patch"
 if (is_mac) {
   host_bundle_id = _result.host_bundle_id
   native_messaging_host_bundle_id = _result.native_messaging_host_bundle_id
-  prefpane_bundle_id = _result.prefpane_bundle_id
   remote_assistance_host_bundle_id = _result.remote_assistance_host_bundle_id
   uninstaller_bundle_id = _result.uninstaller_bundle_id
 
diff --git a/chromium/remoting/resources/BUILD.gn b/chromium/remoting/resources/BUILD.gn
index a12b0e24a58..ba277c5f790 100644
--- a/chromium/remoting/resources/BUILD.gn
+++ b/chromium/remoting/resources/BUILD.gn
@@ -28,7 +28,6 @@ action("verify_resources") {
     "../host/continue_window_mac.mm",
     "../host/disconnect_window_mac.mm",
     "../host/installer/mac/uninstaller/remoting_uninstaller-InfoPlist.strings.jinja2",
-    "../host/mac/me2me_preference_pane-InfoPlist.strings.jinja2",
     "../host/win/core.rc.jinja2",
     "../host/win/host_messages.mc.jinja2",
     "../host/win/version.rc.jinja2",
@@ -95,6 +94,10 @@ grit("strings") {
   if (is_android) {
     outputs += android_string_outputs
   }
+
+  if (is_official_build) {
+    defines = [ "_official_build" ]
+  }
 }
 
 if (is_android) {
diff --git a/chromium/remoting/test/BUILD.gn b/chromium/remoting/test/BUILD.gn
index d3d0db841a1..fa9826c43ec 100644
--- a/chromium/remoting/test/BUILD.gn
+++ b/chromium/remoting/test/BUILD.gn
@@ -73,6 +73,7 @@ static_library("test_support") {
     "//net",
     "//remoting/base",
     "//remoting/client",
+    "//remoting/client/audio",
     "//remoting/codec:decoder",
     "//remoting/codec:encoder",
     "//remoting/protocol",
@@ -210,6 +211,20 @@ if (enable_remoting_host && !is_android && !is_chromeos) {
       ]
     }
   }
+
+  # A binary with a specific version of EvaluateCapabilityLocally() for test
+  # purpose only.
+  executable("capability_test_stub") {
+    testonly = true
+    sources = [
+      "capability_test_stub_main.cc",
+    ]
+
+    deps = [
+      "//base",
+      "//build/config:exe_and_shlib_deps",
+    ]
+  }
 }
 
 source_set("unit_tests") {