BASELINE: Update Chromium to 70.0.3538.78

Change-Id: Ie634710bf039e26c1957f4ae45e101bd4c434ae7
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

20 files changed, 215 insertions, 63 deletions

diff --git a/chromium/remoting/BUILD.gn b/chromium/remoting/BUILD.gn
index f05a26fc13e..080f2e00b66 100644
--- a/chromium/remoting/BUILD.gn
+++ b/chromium/remoting/BUILD.gn
@@ -157,7 +157,6 @@ test("remoting_unittests") {
     "//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",
     "//remoting/protocol:unit_tests",
@@ -192,6 +191,12 @@ test("remoting_unittests") {
       "wtsapi32.lib",
     ]
   }
+
+  if (!is_chromeos) {
+    deps += [
+      "//remoting/client/display:unit_tests",
+    ]
+  }
 }
 
 if (enable_remoting_host) {
diff --git a/chromium/remoting/client/BUILD.gn b/chromium/remoting/client/BUILD.gn
index b7708f6068a..b862dc18290 100644
--- a/chromium/remoting/client/BUILD.gn
+++ b/chromium/remoting/client/BUILD.gn
@@ -6,8 +6,6 @@ static_library("client") {
   sources = [
     "chromoting_client.cc",
     "chromoting_client.h",
-    "chromoting_session.cc",
-    "chromoting_session.h",
     "client_context.cc",
     "client_context.h",
     "client_telemetry_logger.cc",
@@ -55,18 +53,30 @@ static_library("client") {
     sources += [
       "chromoting_client_runtime.cc",
       "chromoting_client_runtime.h",
+      "chromoting_session.cc",
+      "chromoting_session.h",
       "dual_buffer_frame_consumer.cc",
       "dual_buffer_frame_consumer.h",
-      "gesture_interpreter.cc",
-      "gesture_interpreter.h",
       "oauth_token_getter_proxy.cc",
       "oauth_token_getter_proxy.h",
     ]
     deps += [
-      "//remoting/client/display",
+      "//mojo/core/embedder",
       "//remoting/client/input",
       "//remoting/client/ui",
+      "//services/network/public/mojom",
     ]
+
+    if (!is_chromeos) {
+      # GestureInterpreter depends on //remoting/client/display, which currently
+      # doesn't build on CrOS. crbug.com/869578
+      sources += [
+        "gesture_interpreter.cc",
+        "gesture_interpreter.h",
+      ]
+
+      deps += [ "//remoting/client/display" ]
+    }
   }
   if (is_android) {
     libs += [ "android" ]
diff --git a/chromium/remoting/client/audio/BUILD.gn b/chromium/remoting/client/audio/BUILD.gn
index f5faa7aea54..892e2a020f4 100644
--- a/chromium/remoting/client/audio/BUILD.gn
+++ b/chromium/remoting/client/audio/BUILD.gn
@@ -4,16 +4,19 @@
 
 source_set("audio") {
   sources = [
-    "async_audio_frame_supplier.h",
-    "audio_frame_supplier.h",
+    "async_audio_data_supplier.cc",
+    "async_audio_data_supplier.h",
+    "audio_jitter_buffer.cc",
+    "audio_jitter_buffer.h",
+    "audio_playback_sink.h",
+    "audio_playback_stream.cc",
+    "audio_playback_stream.h",
     "audio_player.cc",
     "audio_player.h",
     "audio_player_android.cc",
     "audio_player_android.h",
-    "audio_player_buffer.cc",
-    "audio_player_buffer.h",
-    "audio_stream_consumer.cc",
-    "audio_stream_consumer.h",
+    "audio_stream_format.cc",
+    "audio_stream_format.h",
   ]
 
   configs += [ "//remoting/build/config:version" ]
@@ -33,11 +36,19 @@ source_set("audio") {
   }
 }
 
+source_set("test_support") {
+  testonly = true
+  sources = [
+    "fake_async_audio_data_supplier.cc",
+    "fake_async_audio_data_supplier.h",
+  ]
+}
+
 source_set("unit_tests") {
   testonly = true
 
   sources = [
-    "audio_player_buffer_unittest.cc",
+    "audio_jitter_buffer_unittest.cc",
     "audio_player_unittest.cc",
   ]
 
diff --git a/chromium/remoting/client/display/BUILD.gn b/chromium/remoting/client/display/BUILD.gn
index ca57762bee2..193e4c6fbea 100644
--- a/chromium/remoting/client/display/BUILD.gn
+++ b/chromium/remoting/client/display/BUILD.gn
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# TODO(yuweih): This doesn't build on CrOS. crbug.com/869578
 source_set("display") {
   sources = [
     "canvas.h",
diff --git a/chromium/remoting/client/ui/BUILD.gn b/chromium/remoting/client/ui/BUILD.gn
index 8bd049494e5..8b219098ba8 100644
--- a/chromium/remoting/client/ui/BUILD.gn
+++ b/chromium/remoting/client/ui/BUILD.gn
@@ -12,13 +12,16 @@ source_set("ui") {
 
   deps = [
     ":ui_manipulation",
-    "//remoting/client/display",
   ]
 
   public_deps = [
     "//remoting/proto",
     "//third_party/webrtc/rtc_base:rtc_base_approved",
   ]
+
+  if (!is_chromeos) {
+    deps += [ "//remoting/client/display" ]
+  }
 }
 
 source_set("ui_manipulation") {
diff --git a/chromium/remoting/credits/credits.gni b/chromium/remoting/credits/credits.gni
index 5b53725a683..c75b299670c 100644
--- a/chromium/remoting/credits/credits.gni
+++ b/chromium/remoting/credits/credits.gni
@@ -38,7 +38,7 @@ template("remoting_credits") {
       "--gn-target",
       invoker.gn_target,
       "--gn-out-dir",
-      rebase_path(root_build_dir),
+      ".",
     ]
   }
 
diff --git a/chromium/remoting/host/BUILD.gn b/chromium/remoting/host/BUILD.gn
index b495aded5d0..563d8318c23 100644
--- a/chromium/remoting/host/BUILD.gn
+++ b/chromium/remoting/host/BUILD.gn
@@ -207,11 +207,6 @@ static_library("host") {
     "ipc_video_frame_capturer.h",
     "it2me_desktop_environment.cc",
     "it2me_desktop_environment.h",
-    "local_input_monitor.h",
-    "local_input_monitor_chromeos.cc",
-    "local_input_monitor_mac.mm",
-    "local_input_monitor_win.cc",
-    "local_input_monitor_x11.cc",
     "logging.h",
     "logging_linux.cc",
     "logging_mac.cc",
@@ -301,6 +296,7 @@ static_library("host") {
     "//media",
     "//remoting/base",
     "//remoting/base:authorization",
+    "//remoting/host/input_monitor",
     "//remoting/host/security_key",
     "//remoting/protocol",
     "//remoting/resources",
@@ -348,7 +344,6 @@ static_library("host") {
       "clipboard_x11.cc",
       "desktop_resizer_x11.cc",
       "input_injector_x11.cc",
-      "local_input_monitor_x11.cc",
     ]
   }
 
@@ -382,7 +377,6 @@ static_library("host") {
         "desktop_resizer_x11.cc",
         "input_injector_chromeos.cc",
         "input_injector_chromeos.h",
-        "local_input_monitor_x11.cc",
       ]
     }
   }
@@ -471,11 +465,11 @@ source_set("unit_tests") {
     "host_extension_session_manager_unittest.cc",
     "host_power_save_blocker_unittest.cc",
     "host_status_logger_unittest.cc",
+    "input_monitor/local_input_monitor_unittest.cc",
     "ipc_desktop_environment_unittest.cc",
     "it2me/it2me_confirmation_dialog_proxy_unittest.cc",
     "it2me/it2me_host_unittest.cc",
     "it2me/it2me_native_messaging_host_unittest.cc",
-    "local_input_monitor_unittest.cc",
     "mouse_cursor_monitor_proxy_unittest.cc",
     "mouse_shape_pump_unittest.cc",
     "native_messaging/native_messaging_reader_unittest.cc",
@@ -500,7 +494,7 @@ source_set("unit_tests") {
   ]
 
   if (use_ozone || is_chromeos) {
-    sources -= [ "local_input_monitor_unittest.cc" ]
+    sources -= [ "input_monitor/local_input_monitor_unittest.cc" ]
   }
 
   configs += [ "//remoting/build/config:version" ]
@@ -598,6 +592,7 @@ if (enable_remoting_host) {
 
       deps += [
         "//google_apis",
+        "//mojo/core/embedder",
         "//net",
         "//remoting/host/setup",
       ]
@@ -621,7 +616,9 @@ if (enable_remoting_host) {
     script = "../tools/build/remoting_localize.py"
 
     sources = [
+      "it2me/com.google.chrome.remote_assistance-firefox.json.jinja2",
       "it2me/com.google.chrome.remote_assistance.json.jinja2",
+      "setup/com.google.chrome.remote_desktop-firefox.json.jinja2",
       "setup/com.google.chrome.remote_desktop.json.jinja2",
     ]
 
@@ -699,6 +696,7 @@ if (enable_me2me_host) {
       "//base:i18n",
       "//components/policy/core/common",
       "//ipc",
+      "//mojo/core/embedder",
       "//net",
       "//remoting/base",
       "//remoting/host",
@@ -729,10 +727,6 @@ if (enable_me2me_host) {
     if (is_mac && is_official_build) {
       sources += [ "internal/internal_mac-inl.h" ]
     }
-
-    if (remoting_multi_process != 0) {
-      deps += [ "//mojo/core/embedder" ]
-    }
   }
 
   if (is_win) {
diff --git a/chromium/remoting/host/input_monitor/BUILD.gn b/chromium/remoting/host/input_monitor/BUILD.gn
new file mode 100644
index 00000000000..28d56bf7b78
--- /dev/null
+++ b/chromium/remoting/host/input_monitor/BUILD.gn
@@ -0,0 +1,53 @@
+# Copyright 2018 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("//remoting/build/config/remoting_build.gni")
+
+source_set("input_monitor") {
+  public = [
+    "local_input_monitor.h",
+  ]
+
+  sources = [
+    "local_hotkey_input_monitor.h",
+    "local_hotkey_input_monitor_chromeos.cc",
+    "local_hotkey_input_monitor_mac.mm",
+    "local_hotkey_input_monitor_win.cc",
+    "local_hotkey_input_monitor_x11.cc",
+    "local_input_monitor.cc",
+    "local_input_monitor_win.cc",
+    "local_input_monitor_win.h",
+    "local_keyboard_input_monitor.h",
+    "local_keyboard_input_monitor_chromeos.cc",
+    "local_keyboard_input_monitor_mac.mm",
+    "local_keyboard_input_monitor_win.cc",
+    "local_keyboard_input_monitor_x11.cc",
+    "local_mouse_input_monitor.h",
+    "local_mouse_input_monitor_chromeos.cc",
+    "local_mouse_input_monitor_mac.mm",
+    "local_mouse_input_monitor_win.cc",
+    "local_mouse_input_monitor_x11.cc",
+  ]
+
+  deps = [
+    "//remoting/proto",
+    "//third_party/webrtc/modules/desktop_capture",
+  ]
+
+  if (use_ozone) {
+    deps += [ "//ui/ozone" ]
+  }
+
+  if (is_mac) {
+    deps += [ "//third_party/google_toolbox_for_mac" ]
+  }
+
+  if (!use_x11 || (is_chromeos && !use_ozone)) {
+    sources -= [
+      "local_hotkey_input_monitor_x11.cc",
+      "local_keyboard_input_monitor_x11.cc",
+      "local_mouse_input_monitor_x11.cc",
+    ]
+  }
+}
diff --git a/chromium/remoting/host/installer/mac/BUILD.gn b/chromium/remoting/host/installer/mac/BUILD.gn
index 8e131a72b2e..67d9574df65 100644
--- a/chromium/remoting/host/installer/mac/BUILD.gn
+++ b/chromium/remoting/host/installer/mac/BUILD.gn
@@ -51,6 +51,8 @@ action("remoting_me2me_host_archive") {
            "remoting_host_uninstaller.app",
            "remoting/com.google.chrome.remote_desktop.json",
            "remoting/com.google.chrome.remote_assistance.json",
+           "remoting/com.google.chrome.remote_desktop-firefox.json",
+           "remoting/com.google.chrome.remote_assistance-firefox.json",
            "--generated-files-dst",
            "PrivilegedHelperTools/$host_bundle_name",
            "PrivilegedHelperTools/$host_bundle_name/Contents/MacOS/$native_messaging_host_bundle_name",
@@ -58,6 +60,8 @@ action("remoting_me2me_host_archive") {
            "Applications/$host_uninstaller_name.app",
            "Config/com.google.chrome.remote_desktop.json",
            "Config/com.google.chrome.remote_assistance.json",
+           "Config/Firefox/com.google.chrome.remote_desktop.json",
+           "Config/Firefox/com.google.chrome.remote_assistance.json",
            "--defs",
            "VERSION=$chrome_version_full",
            "VERSION_SHORT=$chrome_version_major.$chrome_version_minor.$chrome_version_build",
diff --git a/chromium/remoting/host/installer/win/BUILD.gn b/chromium/remoting/host/installer/win/BUILD.gn
index 1a08723ef71..645b9718f77 100644
--- a/chromium/remoting/host/installer/win/BUILD.gn
+++ b/chromium/remoting/host/installer/win/BUILD.gn
@@ -62,12 +62,21 @@ action("remoting_me2me_host_archive") {
     "$root_out_dir/remoting_start_host.exe",
     "$root_gen_dir/remoting/CREDITS.txt",
     "$root_out_dir/remoting/com.google.chrome.remote_assistance.json",
+    "$root_out_dir/remoting/com.google.chrome.remote_assistance-firefox.json",
     "$root_out_dir/remoting/com.google.chrome.remote_desktop.json",
+    "$root_out_dir/remoting/com.google.chrome.remote_desktop-firefox.json",
     "$root_out_dir/icudtl.dat",
   ]
 
   _generated_files = rebase_path(inputs, root_build_dir)
-  _generated_files += [ rebase_path("//remoting/resources/chromoting.ico") ]
+  _generated_files +=
+      [ rebase_path("//remoting/resources/chromoting.ico", root_build_dir) ]
+
+  # Inputs that should not be part of _generated_files.
+  inputs += [
+    "chromoting.wxs",
+    "parameters.json",
+  ]
 
   # _generated_dst_files must contain the same files in the same order as
   # _generated_files, otherwise the Windows MSI will not be built correctly.
@@ -82,7 +91,9 @@ action("remoting_me2me_host_archive") {
     "files/remoting_start_host.exe",
     "files/CREDITS.txt",
     "files/com.google.chrome.remote_assistance.json",
+    "files/com.google.chrome.remote_assistance-firefox.json",
     "files/com.google.chrome.remote_desktop.json",
+    "files/com.google.chrome.remote_desktop-firefox.json",
     "files/icudtl.dat",
     "files/chromoting.ico",
   ]
@@ -91,10 +102,12 @@ action("remoting_me2me_host_archive") {
            rebase_path("$root_gen_dir/remoting_installation", root_build_dir),
            rebase_path(_output, root_build_dir),
            "--source-file-roots",
-           rebase_path("//remoting/host/installer/win"),
+           rebase_path("//remoting/host/installer/win", root_build_dir),
            "--source-files",
-           rebase_path("//remoting/host/installer/win/chromoting.wxs"),
-           rebase_path("//remoting/host/installer/win/parameters.json"),
+           rebase_path("//remoting/host/installer/win/chromoting.wxs",
+                       root_build_dir),
+           rebase_path("//remoting/host/installer/win/parameters.json",
+                       root_build_dir),
 
            # Input files
            "--generated-files",
@@ -129,7 +142,7 @@ if (is_chrome_branded && !is_component_build && target_cpu == "x86") {
     ]
     args = [
       "--wix_path",
-      rebase_path("//third_party/wix"),
+      rebase_path("//third_party/wix", root_build_dir),
       "--intermediate_dir",
       rebase_path("$root_gen_dir/remoting_installation", root_build_dir),
       "--target_arch",
diff --git a/chromium/remoting/host/it2me/BUILD.gn b/chromium/remoting/host/it2me/BUILD.gn
index b69e217f0e4..1d8b50d2320 100644
--- a/chromium/remoting/host/it2me/BUILD.gn
+++ b/chromium/remoting/host/it2me/BUILD.gn
@@ -14,6 +14,9 @@ if (is_mac) {
   import("//build/config/mac/rules.gni")
   import("//third_party/icu/config.gni")
 }
+if (is_chromeos) {
+  import("//ui/ozone/ozone.gni")
+}
 
 source_set("common") {
   sources = [
@@ -42,6 +45,7 @@ source_set("common") {
 
   deps = [
     "//base:i18n",
+    "//mojo/core/embedder",
     "//net",
     "//remoting/base",
     "//remoting/host",
@@ -49,7 +53,6 @@ source_set("common") {
     "//remoting/resources",
     "//remoting/signaling",
   ]
-
   if (is_desktop_linux) {
     deps += [
       "//build/config/linux/gtk",
@@ -62,6 +65,24 @@ source_set("common") {
   }
 }
 
+if (is_chromeos) {
+  source_set("chrome_os_host") {
+    sources = [
+      "it2me_native_messaging_host_chromeos.cc",
+      "it2me_native_messaging_host_chromeos.h",
+    ]
+
+    deps = [
+      ":common",
+      "//skia",
+    ]
+
+    if (use_ozone) {
+      deps += [ "//ui/ozone" ]
+    }
+  }
+}
+
 if (!is_chromeos && enable_remoting_host) {
   if (is_win) {
     executable("remote_assistance_host") {
diff --git a/chromium/remoting/host/linux/BUILD.gn b/chromium/remoting/host/linux/BUILD.gn
index 6fca9dc33af..fa24d0b9b4a 100644
--- a/chromium/remoting/host/linux/BUILD.gn
+++ b/chromium/remoting/host/linux/BUILD.gn
@@ -62,10 +62,10 @@ if (enable_me2me_host) {
     if (is_component_build) {
       sources += [ "$root_build_dir/libbase.so" ]
       deps += [ "//base:base" ]
-    }
-    if (!libcpp_is_static && use_custom_libcxx) {
-      sources += [ "$root_build_dir/libc++.so" ]
-      deps += [ "//buildtools/third_party/libc++" ]
+      if (use_custom_libcxx) {
+        sources += [ "$root_build_dir/libc++.so" ]
+        deps += [ "//buildtools/third_party/libc++" ]
+      }
     }
   }
 
@@ -103,22 +103,24 @@ source_set("linux") {
   }
 }
 
-source_set("x11") {
-  sources = [
-    "unicode_to_keysym.cc",
-    "unicode_to_keysym.h",
-    "x11_character_injector.cc",
-    "x11_character_injector.h",
-    "x11_keyboard_impl.cc",
-    "x11_keyboard_impl.h",
-    "x11_util.cc",
-    "x11_util.h",
-    "x_server_clipboard.cc",
-    "x_server_clipboard.h",
-  ]
-  deps = [
-    "//third_party/webrtc/modules/desktop_capture",
-  ]
+if (use_x11) {
+  source_set("x11") {
+    sources = [
+      "unicode_to_keysym.cc",
+      "unicode_to_keysym.h",
+      "x11_character_injector.cc",
+      "x11_character_injector.h",
+      "x11_keyboard_impl.cc",
+      "x11_keyboard_impl.h",
+      "x11_util.cc",
+      "x11_util.h",
+      "x_server_clipboard.cc",
+      "x_server_clipboard.h",
+    ]
+    deps = [
+      "//third_party/webrtc/modules/desktop_capture",
+    ]
+  }
 }
 
 executable("remoting_native_messaging_host") {
@@ -138,6 +140,7 @@ executable("remoting_native_messaging_host") {
     "//remoting/host:remoting_infoplist_strings",
     "//remoting/host/native_messaging",
     "//remoting/host/setup",
+    "//services/network/public/mojom",
   ]
 
   # The |major|, |build| and |patch| versions are inherited from Chrome.
@@ -160,7 +163,10 @@ source_set("unit_tests") {
   ]
 
   if (!use_x11) {
-    sources -= [ "unicode_to_keysym_unittest.cc" ]
+    sources -= [
+      "unicode_to_keysym_unittest.cc",
+      "x_server_clipboard_unittest.cc",
+    ]
   }
 
   configs += [ "//remoting/build/config:version" ]
diff --git a/chromium/remoting/host/mac/BUILD.gn b/chromium/remoting/host/mac/BUILD.gn
index f9d46f433c1..a3fc05b827e 100644
--- a/chromium/remoting/host/mac/BUILD.gn
+++ b/chromium/remoting/host/mac/BUILD.gn
@@ -165,6 +165,7 @@ target("mac_app_bundle", "remoting_native_messaging_host") {
     "//remoting/host:remoting_infoplist_strings",
     "//remoting/host/native_messaging",
     "//remoting/host/setup",
+    "//services/network/public/mojom",
   ]
   foreach(locale, remoting_locales_with_underscores) {
     deps += [
diff --git a/chromium/remoting/host/setup/BUILD.gn b/chromium/remoting/host/setup/BUILD.gn
index 2f5da09b965..3f6cef8105b 100644
--- a/chromium/remoting/host/setup/BUILD.gn
+++ b/chromium/remoting/host/setup/BUILD.gn
@@ -34,9 +34,12 @@ source_set("setup") {
   deps = [
     "//base",
     "//google_apis",
+    "//mojo/core/embedder",
     "//remoting/base:authorization",
     "//remoting/host",
     "//remoting/host/native_messaging",
+    "//services/network/public/cpp",
+    "//services/network/public/mojom",
   ]
 
   if (is_mac || is_ios) {
diff --git a/chromium/remoting/host/win/BUILD.gn b/chromium/remoting/host/win/BUILD.gn
index 4102b23dace..3e7054e4b9c 100644
--- a/chromium/remoting/host/win/BUILD.gn
+++ b/chromium/remoting/host/win/BUILD.gn
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/toolchain/win/midl.gni")
+import("//build/util/lastchange.gni")
 import("//build/win/message_compiler.gni")
 import("//media/media_options.gni")
 import("//remoting/build/config/remoting_build.gni")
@@ -81,6 +82,8 @@ source_set("win") {
     "com_security.h",
     "default_audio_device_change_detector.cc",
     "default_audio_device_change_detector.h",
+    "evaluate_3d_display_mode.cc",
+    "evaluate_3d_display_mode.h",
     "evaluate_d3d.cc",
     "evaluate_d3d.h",
     "launch_process_with_token.cc",
@@ -404,6 +407,7 @@ shared_library("remoting_core") {
     "//remoting/host/setup",
     "//remoting/protocol",
     "//sandbox/win:sandbox",  # Should always use Windows version
+    "//services/network/public/mojom",
     "//third_party/webrtc/modules/desktop_capture",
   ]
 
@@ -491,7 +495,7 @@ remoting_localize("remoting_windows_resources") {
   variables = [
     rebase_path(chrome_version_file),
     rebase_path(remoting_version_file),
-    rebase_path("//build/util/LASTCHANGE"),
+    rebase_path(lastchange_file),
   ]
 
   output = "$root_gen_dir/remoting/{{source_name_part}}"
diff --git a/chromium/remoting/ios/BUILD.gn b/chromium/remoting/ios/BUILD.gn
index d99e335eaf4..0d8fc28dbe2 100644
--- a/chromium/remoting/ios/BUILD.gn
+++ b/chromium/remoting/ios/BUILD.gn
@@ -78,7 +78,8 @@ test("ios_remoting_unittests") {
   deps = [
     "//base/test:run_all_unittests",
     "//base/test:test_support",
-    "//remoting//ios/facade:unit_tests",
+    "//remoting/ios/audio:unit_tests",
+    "//remoting/ios/facade:unit_tests",
     "//remoting/ios/persistence:unit_tests",
   ]
 
diff --git a/chromium/remoting/ios/audio/BUILD.gn b/chromium/remoting/ios/audio/BUILD.gn
index 8132362d82d..fb57d010bcb 100644
--- a/chromium/remoting/ios/audio/BUILD.gn
+++ b/chromium/remoting/ios/audio/BUILD.gn
@@ -8,11 +8,8 @@ import("//remoting/build/config/remoting_build.gni")
 
 source_set("audio") {
   sources = [
-    "audio_player_ios.h",
-    "audio_player_ios.mm",
-    "audio_player_ios_wrapper.h",
-    "audio_stream_consumer_proxy.cc",
-    "audio_stream_consumer_proxy.h",
+    "audio_playback_sink_ios.cc",
+    "audio_playback_sink_ios.h",
   ]
 
   deps = [
@@ -21,5 +18,26 @@ source_set("audio") {
     "//remoting/client/audio",
   ]
 
+  public_deps = [
+    "//remoting/proto",
+  ]
+
+  libs = [ "AudioToolbox.framework" ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [
+    "audio_playback_sink_ios_unittest.cc",
+  ]
+  deps = [
+    ":audio",
+    "//remoting/client/audio:test_support",
+    "//testing/gmock",
+    "//testing/gtest",
+  ]
+
   configs += [ "//build/config/compiler:enable_arc" ]
 }
diff --git a/chromium/remoting/proto/BUILD.gn b/chromium/remoting/proto/BUILD.gn
index 99b0f3be819..e579b41c470 100644
--- a/chromium/remoting/proto/BUILD.gn
+++ b/chromium/remoting/proto/BUILD.gn
@@ -20,7 +20,7 @@ proto_library("proto") {
     "internal.proto",
     "mux.proto",
     "process_stats.proto",
-    "test.proto",
+    "test_data_channel_manager.proto",
     "video.proto",
     "video_stats.proto",
   ]
diff --git a/chromium/remoting/protocol/BUILD.gn b/chromium/remoting/protocol/BUILD.gn
index 71846a6161c..6b7a9784695 100644
--- a/chromium/remoting/protocol/BUILD.gn
+++ b/chromium/remoting/protocol/BUILD.gn
@@ -260,6 +260,7 @@ static_library("protocol") {
       "//third_party/webrtc/api/audio_codecs:audio_codecs_api",
       "//third_party/webrtc/api/audio_codecs/opus:audio_decoder_opus",
       "//third_party/webrtc/api/audio_codecs/opus:audio_encoder_opus",
+      "//third_party/webrtc/api/video_codecs:builtin_video_decoder_factory",
       "//third_party/webrtc_overrides:init_webrtc",
     ]
   }
diff --git a/chromium/remoting/test/BUILD.gn b/chromium/remoting/test/BUILD.gn
index fa1b4c3c0c0..26704912353 100644
--- a/chromium/remoting/test/BUILD.gn
+++ b/chromium/remoting/test/BUILD.gn
@@ -70,6 +70,7 @@ static_library("test_support") {
 
   public_deps = [
     "//base",
+    "//mojo/core/embedder",
     "//net",
     "//remoting/base",
     "//remoting/client",
@@ -78,6 +79,7 @@ static_library("test_support") {
     "//remoting/codec:encoder",
     "//remoting/protocol",
     "//remoting/signaling",
+    "//services/network:test_support",
     "//third_party/webrtc/modules/desktop_capture",
     "//ui/gfx",
   ]
@@ -243,6 +245,7 @@ source_set("unit_tests") {
     ":test_support",
     "//base",
     "//net:test_support",
+    "//services/network:test_support",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/libyuv",