BASELINE: Update Chromium to 73.0.3683.37

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

12 files changed, 98 insertions, 34 deletions

diff --git a/chromium/remoting/base/BUILD.gn b/chromium/remoting/base/BUILD.gn
index b43c596381f..e362c453269 100644
--- a/chromium/remoting/base/BUILD.gn
+++ b/chromium/remoting/base/BUILD.gn
@@ -29,6 +29,7 @@ source_set("base") {
     "rate_counter.h",
     "remoting_bot.cc",
     "remoting_bot.h",
+    "result.h",
     "rsa_key_pair.cc",
     "rsa_key_pair.h",
     "running_samples.cc",
@@ -168,6 +169,7 @@ source_set("unit_tests") {
     "compound_buffer_unittest.cc",
     "oauth_helper_unittest.cc",
     "rate_counter_unittest.cc",
+    "result_unittest.cc",
     "rsa_key_pair_unittest.cc",
     "run_all_unittests.cc",
     "running_samples_unittest.cc",
diff --git a/chromium/remoting/client/plugin/BUILD.gn b/chromium/remoting/client/plugin/BUILD.gn
index 42bd699966d..7b69b6f9980 100644
--- a/chromium/remoting/client/plugin/BUILD.gn
+++ b/chromium/remoting/client/plugin/BUILD.gn
@@ -59,6 +59,7 @@ executable("remoting_client_plugin_newlib") {
     "//third_party/libyuv",
     "//third_party/webrtc/modules/desktop_capture:primitives",
     "//third_party/webrtc_overrides:metrics",
+    "//third_party/webrtc_overrides:task_queue_impl",
     "//ui/events:dom_keycode_converter",
   ]
 
diff --git a/chromium/remoting/host/BUILD.gn b/chromium/remoting/host/BUILD.gn
index 67e7d837164..8082ebcbeed 100644
--- a/chromium/remoting/host/BUILD.gn
+++ b/chromium/remoting/host/BUILD.gn
@@ -45,6 +45,15 @@ process_version("remoting_version") {
   output = "$target_gen_dir/version.h"
 }
 
+source_set("host") {
+  public_deps = [
+    ":common",
+  ]
+  deps = [
+    "//remoting/host/file_transfer",
+  ]
+}
+
 # This must be a static library instead of a source set because
 # remoting_unittests requires that remoting_me2me_host.cc not be pulled in,
 # which in turn depends on remoting_me2me_host_static which isn't part of that
@@ -52,7 +61,7 @@ process_version("remoting_version") {
 #
 # TODO fix this, successful builds should not depend on static libraries
 # stripping code.
-static_library("host") {
+static_library("common") {
   sources = [
     "action_executor.cc",
     "action_executor.h",
@@ -84,6 +93,7 @@ static_library("host") {
     "chromoting_messages.h",
     "chromoting_param_traits.cc",
     "chromoting_param_traits.h",
+    "chromoting_param_traits_impl.h",
     "client_session.cc",
     "client_session.h",
     "client_session_control.h",
@@ -142,13 +152,6 @@ static_library("host") {
     "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",
@@ -304,6 +307,7 @@ static_library("host") {
     "//media",
     "//remoting/base",
     "//remoting/base:authorization",
+    "//remoting/host/file_transfer:common",
     "//remoting/host/input_monitor",
     "//remoting/host/security_key",
     "//remoting/protocol",
@@ -438,8 +442,9 @@ static_library("test_support") {
     "//testing/gtest",
   ]
   public_deps = [
-    ":host",
+    ":common",
     "//remoting/base:test_support",
+    "//remoting/host/file_transfer:test_support",
     "//third_party/libjingle_xmpp",
     "//third_party/protobuf:protobuf_lite",
     "//third_party/webrtc/modules/desktop_capture",
@@ -462,8 +467,6 @@ 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",
@@ -509,13 +512,13 @@ source_set("unit_tests") {
   configs += [ "//remoting/build/config:version" ]
 
   deps = [
-    ":host",
+    ":common",
     ":test_support",
     "//remoting/host/file_transfer:unit_tests",
     "//remoting/host/it2me:common",
     "//remoting/host/native_messaging",
     "//remoting/host/security_key:unit_tests",
-    "//remoting/host/setup",
+    "//remoting/host/setup:common",
     "//remoting/proto",
     "//remoting/resources",
     "//skia",
@@ -712,6 +715,7 @@ if (enable_me2me_host) {
       "//remoting/host",
       "//remoting/proto",
       "//third_party/libjingle_xmpp",
+      "//third_party/webrtc/api:scoped_refptr",
       "//third_party/webrtc/modules/desktop_capture",
       "//third_party/webrtc_overrides:init_webrtc",
     ]
diff --git a/chromium/remoting/host/chromeos/BUILD.gn b/chromium/remoting/host/chromeos/BUILD.gn
index 98bf999534f..d6ae15d47ee 100644
--- a/chromium/remoting/host/chromeos/BUILD.gn
+++ b/chromium/remoting/host/chromeos/BUILD.gn
@@ -47,7 +47,7 @@ source_set("unit_tests") {
   configs += [ "//remoting/build/config:version" ]
 
   deps = [
-    "//remoting/host",
+    "//remoting/host:common",
     "//remoting/host:test_support",
     "//remoting/proto",
     "//remoting/resources",
diff --git a/chromium/remoting/host/file_transfer/BUILD.gn b/chromium/remoting/host/file_transfer/BUILD.gn
index 01d92068b4e..25065b0ea14 100644
--- a/chromium/remoting/host/file_transfer/BUILD.gn
+++ b/chromium/remoting/host/file_transfer/BUILD.gn
@@ -5,13 +5,49 @@
 import("//remoting/build/config/remoting_build.gni")
 
 source_set("file_transfer") {
+  sources = [
+    "ensure_user_mac.cc",
+    "ensure_user_win.cc",
+    "get_desktop_directory.cc",
+    "get_desktop_directory.h",
+    "get_desktop_directory_win.cc",
+  ]
+
+  public_deps = [
+    ":common",
+  ]
+
+  deps = [
+    "//base",
+    "//remoting/protocol",
+  ]
+
+  if (!is_mac && !is_win) {
+    sources += [ "ensure_user_no_op.cc" ]
+  }
+
+  if (is_win) {
+    sources -= [ "get_desktop_directory.cc" ]
+  }
+}
+
+source_set("common") {
   public = [
     "file_operations.h",
+    "file_transfer_message_handler.h",
+    "ipc_file_operations.h",
     "local_file_operations.h",
+    "session_file_operations_handler.h",
   ]
 
   sources = [
+    "buffered_file_writer.cc",
+    "buffered_file_writer.h",
+    "ensure_user.h",
+    "file_transfer_message_handler.cc",
+    "ipc_file_operations.cc",
     "local_file_operations.cc",
+    "session_file_operations_handler.cc",
   ]
 
   deps = [
@@ -20,15 +56,33 @@ source_set("file_transfer") {
   ]
 }
 
+source_set("test_support") {
+  testonly = true
+
+  sources = [
+    "ensure_user_no_op.cc",
+    "fake_file_operations.cc",
+    "fake_file_operations.h",
+    "get_desktop_directory.cc",
+  ]
+  deps = [
+    ":common",
+    "//remoting/protocol",
+  ]
+}
+
 source_set("unit_tests") {
   testonly = true
 
   sources = [
+    "buffered_file_writer_unittest.cc",
+    "file_transfer_message_handler_unittest.cc",
     "local_file_operations_unittest.cc",
   ]
 
   deps = [
-    ":file_transfer",
+    ":common",
+    ":test_support",
     "//remoting/protocol",
     "//testing/gtest",
   ]
diff --git a/chromium/remoting/host/installer/mac/BUILD.gn b/chromium/remoting/host/installer/mac/BUILD.gn
index f4b135738b7..357b1f566e3 100644
--- a/chromium/remoting/host/installer/mac/BUILD.gn
+++ b/chromium/remoting/host/installer/mac/BUILD.gn
@@ -141,6 +141,7 @@ mac_app_bundle("remoting_host_uninstaller") {
     "//base",
     "//remoting/host:remoting_infoplist_strings",
     "//remoting/host/mac:constants",
+    "//ui/base:base",
   ]
   foreach(locale, remoting_locales_with_underscores) {
     deps += [ ":remoting_uninstaller_strings_${locale}_bundle_data" ]
diff --git a/chromium/remoting/host/it2me/BUILD.gn b/chromium/remoting/host/it2me/BUILD.gn
index 1d8b50d2320..39dc4673757 100644
--- a/chromium/remoting/host/it2me/BUILD.gn
+++ b/chromium/remoting/host/it2me/BUILD.gn
@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
-import("//remoting/remoting_options.gni")
 import("//remoting/remoting_locales.gni")
+import("//remoting/remoting_options.gni")
 import("//remoting/remoting_version.gni")
 
 if (is_win) {
@@ -48,7 +48,7 @@ source_set("common") {
     "//mojo/core/embedder",
     "//net",
     "//remoting/base",
-    "//remoting/host",
+    "//remoting/host:common",
     "//remoting/protocol",
     "//remoting/resources",
     "//remoting/signaling",
diff --git a/chromium/remoting/host/linux/BUILD.gn b/chromium/remoting/host/linux/BUILD.gn
index fa24d0b9b4a..a07f8b0254a 100644
--- a/chromium/remoting/host/linux/BUILD.gn
+++ b/chromium/remoting/host/linux/BUILD.gn
@@ -172,12 +172,12 @@ source_set("unit_tests") {
   configs += [ "//remoting/build/config:version" ]
 
   deps = [
-    "//remoting/host",
+    "//remoting/host:common",
     "//remoting/host:test_support",
     "//remoting/host/it2me:common",
     "//remoting/host/native_messaging",
     "//remoting/host/security_key:unit_tests",
-    "//remoting/host/setup",
+    "//remoting/host/setup:common",
     "//remoting/proto",
     "//remoting/resources",
     "//skia",
diff --git a/chromium/remoting/host/setup/BUILD.gn b/chromium/remoting/host/setup/BUILD.gn
index 3f6cef8105b..b5809f615e0 100644
--- a/chromium/remoting/host/setup/BUILD.gn
+++ b/chromium/remoting/host/setup/BUILD.gn
@@ -3,6 +3,15 @@
 # found in the LICENSE file.
 
 source_set("setup") {
+  public_deps = [
+    ":common",
+  ]
+  deps = [
+    "//remoting/host",
+  ]
+}
+
+source_set("common") {
   sources = [
     "daemon_controller.cc",
     "daemon_controller.h",
@@ -20,8 +29,6 @@ source_set("setup") {
     "service_client.h",
     "test_util.cc",
     "test_util.h",
-    "win/auth_code_getter.cc",
-    "win/auth_code_getter.h",
   ]
 
   configs += [
@@ -36,7 +43,7 @@ source_set("setup") {
     "//google_apis",
     "//mojo/core/embedder",
     "//remoting/base:authorization",
-    "//remoting/host",
+    "//remoting/host:common",
     "//remoting/host/native_messaging",
     "//services/network/public/cpp",
     "//services/network/public/mojom",
diff --git a/chromium/remoting/protocol/BUILD.gn b/chromium/remoting/protocol/BUILD.gn
index fb9f4b4af44..18e653fa461 100644
--- a/chromium/remoting/protocol/BUILD.gn
+++ b/chromium/remoting/protocol/BUILD.gn
@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
-import("//remoting/remoting_options.gni")
 import("//media/media_options.gni")
+import("//remoting/remoting_options.gni")
 
 static_library("protocol") {
   sources = [
@@ -144,6 +144,8 @@ static_library("protocol") {
     "pseudotcp_channel_factory.h",
     "rejecting_authenticator.cc",
     "rejecting_authenticator.h",
+    "rfc7050_ip_synthesizer.cc",
+    "rfc7050_ip_synthesizer.h",
     "sdp_message.cc",
     "sdp_message.h",
     "secure_channel_factory.cc",
@@ -224,6 +226,8 @@ static_library("protocol") {
       "chromium_port_allocator_factory.h",
       "chromium_socket_factory.cc",
       "chromium_socket_factory.h",
+      "rfc7050_prefix_refresher.cc",
+      "rfc7050_prefix_refresher.h",
       "webrtc_audio_module.cc",
       "webrtc_audio_module.h",
       "webrtc_audio_sink_adapter.cc",
@@ -232,8 +236,6 @@ static_library("protocol") {
       "webrtc_connection_to_host.h",
       "webrtc_data_stream_adapter.cc",
       "webrtc_data_stream_adapter.h",
-      "webrtc_dummy_video_capturer.cc",
-      "webrtc_dummy_video_capturer.h",
       "webrtc_dummy_video_encoder.cc",
       "webrtc_dummy_video_encoder.h",
       "webrtc_transport.cc",
@@ -360,6 +362,7 @@ source_set("unit_tests") {
     "port_range_unittest.cc",
     "ppapi_module_stub.cc",
     "pseudotcp_adapter_unittest.cc",
+    "rfc7050_ip_synthesizer_unittest.cc",
     "sdp_message_unittest.cc",
     "session_config_unittest.cc",
     "spake2_authenticator_unittest.cc",
diff --git a/chromium/remoting/test/BUILD.gn b/chromium/remoting/test/BUILD.gn
index 26704912353..0bb66b9b7e9 100644
--- a/chromium/remoting/test/BUILD.gn
+++ b/chromium/remoting/test/BUILD.gn
@@ -159,7 +159,7 @@ if (enable_remoting_host && !is_android && !is_chromeos) {
     ]
 
     deps = [
-      "//remoting/host",
+      "//remoting/host:common",
       "//remoting/protocol:test_support",
     ]
   }
diff --git a/chromium/remoting/webapp/files.gni b/chromium/remoting/webapp/files.gni
index 786d3dcdda1..72fd6724fb9 100644
--- a/chromium/remoting/webapp/files.gni
+++ b/chromium/remoting/webapp/files.gni
@@ -2,14 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# `7MM"""Mq.                       `7MM
-#   MM   `MM.                        MM
-#   MM   ,M9  .gP"Ya   ,6"Yb.   ,M""bMM  `7MMpMMMb.pMMMb.  .gP"Ya
-#   MMmmdM9  ,M'   Yb 8)   MM ,AP    MM    MM    MM    MM ,M'   Yb
-#   MM  YM.  8M""""""  ,pm9MM 8MI    MM    MM    MM    MM 8M""""""
-#   MM   `Mb.YM.    , 8M   MM `Mb    MM    MM    MM    MM YM.    ,
-# .JMML. .JMM.`Mbmmd' `Moo9^Yo.`Wbmd"MML..JMML  JMML  JMML.`Mbmmd'
-#
 # Please keep this file in sync with remoting/remoting_webapp_files.gypi .
 
 # JSCompiler externs.