BASELINE: Update Chromium to 88.0.4324.208

Change-Id: I3ae87d23e4eff4b4a469685658740a213600c667
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

19 files changed, 232 insertions, 239 deletions

diff --git a/chromium/remoting/android/remoting_apk_tmpl.gni b/chromium/remoting/android/remoting_apk_tmpl.gni
index 80fb2e6e1cc..7e7805157b4 100644
--- a/chromium/remoting/android/remoting_apk_tmpl.gni
+++ b/chromium/remoting/android/remoting_apk_tmpl.gni
@@ -13,7 +13,9 @@ template("remoting_apk_tmpl") {
     if (!is_java_debug) {
       proguard_enabled = true
       enable_multidex = false
-      disable_checkdiscard = true
+
+      # -checkdiscard checks fail due to -dontoptimize.
+      enable_proguard_checks = false
       if (!defined(proguard_configs)) {
         proguard_configs = []
       }
diff --git a/chromium/remoting/base/BUILD.gn b/chromium/remoting/base/BUILD.gn
index 35628d0e5a5..12e15e3a55a 100644
--- a/chromium/remoting/base/BUILD.gn
+++ b/chromium/remoting/base/BUILD.gn
@@ -4,12 +4,6 @@
 
 import("//third_party/protobuf/proto_library.gni")
 
-# Reset sources_assignment_filter for the BUILD.gn file to prevent
-# regression during the migration of Chromium away from the feature.
-# See docs/no_sources_assignment_filter.md for more information.
-# TODO(crbug.com/1018739): remove this when migration is done.
-set_sources_assignment_filter([])
-
 proto_library("protobuf_http_client_messages_proto") {
   sources = [ "protobuf_http_client_messages.proto" ]
 }
diff --git a/chromium/remoting/client/audio/BUILD.gn b/chromium/remoting/client/audio/BUILD.gn
index a84301a4677..2ab030bfc12 100644
--- a/chromium/remoting/client/audio/BUILD.gn
+++ b/chromium/remoting/client/audio/BUILD.gn
@@ -2,12 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# Reset sources_assignment_filter for the BUILD.gn file to prevent
-# regression during the migration of Chromium away from the feature.
-# See docs/no_sources_assignment_filter.md for more information.
-# TODO(crbug.com/1018739): remove this when migration is done.
-set_sources_assignment_filter([])
-
 source_set("audio") {
   sources = [
     "async_audio_data_supplier.cc",
diff --git a/chromium/remoting/client/input/BUILD.gn b/chromium/remoting/client/input/BUILD.gn
index 97cb32df90a..9de3c0fc600 100644
--- a/chromium/remoting/client/input/BUILD.gn
+++ b/chromium/remoting/client/input/BUILD.gn
@@ -2,12 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# Reset sources_assignment_filter for the BUILD.gn file to prevent
-# regression during the migration of Chromium away from the feature.
-# See docs/no_sources_assignment_filter.md for more information.
-# TODO(crbug.com/1018739): remove this when migration is done.
-set_sources_assignment_filter([])
-
 source_set("input") {
   sources = [
     "client_input_injector.h",
diff --git a/chromium/remoting/host/BUILD.gn b/chromium/remoting/host/BUILD.gn
index 4ccd546c2d3..c44741d9b65 100644
--- a/chromium/remoting/host/BUILD.gn
+++ b/chromium/remoting/host/BUILD.gn
@@ -2,16 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/python.gni")
 import("//build/util/process_version.gni")
 import("//remoting/build/config/remoting_build.gni")
 
-# This file depends on the legacy global sources assignment filter. It should
-# be converted to check target platform before assigning source files to the
-# sources variable. Remove this import and set_sources_assignment_filter call
-# when the file has been converted. See https://crbug.com/1018739 for details.
-import("//build/config/deprecated_default_sources_assignment_filter.gni")
-set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
-
 group("all_tests") {
   testonly = true
 
@@ -56,9 +50,6 @@ source_set("base") {
     "host_exit_codes.cc",
     "host_exit_codes.h",
     "logging.h",
-    "logging_linux.cc",
-    "logging_mac.cc",
-    "logging_win.cc",
     "switches.cc",
     "switches.h",
     "username.cc",
@@ -68,6 +59,18 @@ source_set("base") {
     "//base",
     "//remoting/base",
   ]
+
+  if (is_linux || is_chromeos) {
+    sources += [ "logging_linux.cc" ]
+  }
+
+  if (is_mac) {
+    sources += [ "logging_mac.cc" ]
+  }
+
+  if (is_win) {
+    sources += [ "logging_win.cc" ]
+  }
 }
 
 # This must be a static library instead of a source set because
@@ -85,12 +88,6 @@ static_library("common") {
     "action_message_handler.h",
     "audio_capturer.cc",
     "audio_capturer.h",
-    "audio_capturer_chromeos.cc",
-    "audio_capturer_linux.cc",
-    "audio_capturer_linux.h",
-    "audio_capturer_mac.cc",
-    "audio_capturer_win.cc",
-    "audio_capturer_win.h",
     "audio_silence_detector.cc",
     "audio_silence_detector.h",
     "audio_volume_filter.cc",
@@ -115,27 +112,16 @@ static_library("common") {
     "client_session_control.h",
     "client_session_details.h",
     "clipboard.h",
-    "clipboard_mac.mm",
-    "clipboard_win.cc",
-    "clipboard_x11.cc",
     "config_file_watcher.cc",
     "config_file_watcher.h",
     "config_watcher.h",
     "continue_window.cc",
     "continue_window.h",
-    "continue_window_chromeos.cc",
-    "continue_window_linux.cc",
-    "continue_window_mac.mm",
-    "continue_window_win.cc",
     "current_process_stats_agent.cc",
     "current_process_stats_agent.h",
     "curtain_mode.h",
-    "curtain_mode_linux.cc",
-    "curtain_mode_mac.cc",
-    "curtain_mode_win.cc",
     "daemon_process.cc",
     "daemon_process.h",
-    "daemon_process_win.cc",
     "desktop_and_cursor_conditional_composer.cc",
     "desktop_and_cursor_conditional_composer.h",
     "desktop_capturer_checker.cc",
@@ -144,19 +130,12 @@ static_library("common") {
     "desktop_capturer_proxy.h",
     "desktop_display_info.cc",
     "desktop_display_info.h",
-    "desktop_display_info_mac.mm",
     "desktop_environment.h",
     "desktop_environment_options.cc",
     "desktop_environment_options.h",
     "desktop_process.cc",
     "desktop_process.h",
     "desktop_resizer.h",
-    "desktop_resizer_mac.cc",
-    "desktop_resizer_ozone.cc",
-    "desktop_resizer_ozone.h",
-    "desktop_resizer_win.cc",
-    "desktop_resizer_x11.cc",
-    "desktop_resizer_x11.h",
     "desktop_session.cc",
     "desktop_session.h",
     "desktop_session_agent.cc",
@@ -164,13 +143,6 @@ static_library("common") {
     "desktop_session_connector.h",
     "desktop_session_proxy.cc",
     "desktop_session_proxy.h",
-    "desktop_session_win.cc",
-    "desktop_session_win.h",
-    "disconnect_window_chromeos.cc",
-    "disconnect_window_linux.cc",
-    "disconnect_window_mac.h",
-    "disconnect_window_mac.mm",
-    "disconnect_window_win.cc",
     "evaluate_capability.cc",
     "evaluate_capability.h",
     "forward_process_stats_agent.cc",
@@ -190,7 +162,6 @@ static_library("common") {
     "host_details.cc",
     "host_details.h",
     "host_event_logger.h",
-    "host_event_logger_win.cc",
     "host_experiment_session_plugin.cc",
     "host_experiment_session_plugin.h",
     "host_export.h",
@@ -212,11 +183,6 @@ static_library("common") {
     "host_window_proxy.cc",
     "host_window_proxy.h",
     "input_injector.h",
-    "input_injector_chromeos.cc",
-    "input_injector_chromeos.h",
-    "input_injector_mac.cc",
-    "input_injector_win.cc",
-    "input_injector_x11.cc",
     "ipc_action_executor.cc",
     "ipc_action_executor.h",
     "ipc_audio_capturer.cc",
@@ -241,23 +207,12 @@ static_library("common") {
     "it2me_desktop_environment.h",
     "keyboard_layout_monitor.cc",
     "keyboard_layout_monitor.h",
-    "keyboard_layout_monitor_chromeos.cc",
-    "keyboard_layout_monitor_linux.cc",
-    "keyboard_layout_monitor_mac.cc",
-    "keyboard_layout_monitor_win.cc",
-    "me2me_desktop_environment.cc",
-    "me2me_desktop_environment.h",
     "mouse_cursor_monitor_proxy.cc",
     "mouse_cursor_monitor_proxy.h",
     "mouse_shape_pump.cc",
     "mouse_shape_pump.h",
     "pairing_registry_delegate.cc",
     "pairing_registry_delegate.h",
-    "pairing_registry_delegate_linux.cc",
-    "pairing_registry_delegate_linux.h",
-    "pairing_registry_delegate_mac.cc",
-    "pairing_registry_delegate_win.cc",
-    "pairing_registry_delegate_win.h",
     "pin_hash.cc",
     "pin_hash.h",
     "pointer_lock_detector.cc",
@@ -275,11 +230,7 @@ static_library("common") {
     "resizing_host_observer.cc",
     "resizing_host_observer.h",
     "resources.h",
-    "resources_linux.cc",
-    "resources_mac.cc",
-    "resources_win.cc",
     "sas_injector.h",
-    "sas_injector_win.cc",
     "screen_controls.h",
     "screen_resolution.cc",
     "screen_resolution.h",
@@ -297,14 +248,9 @@ static_library("common") {
     "token_validator_base.h",
     "token_validator_factory_impl.cc",
     "token_validator_factory_impl.h",
-    "touch_injector_win.cc",
-    "touch_injector_win.h",
     "usage_stats_consent.h",
-    "usage_stats_consent_mac.cc",
-    "usage_stats_consent_win.cc",
     "xmpp_register_support_host_request.cc",
     "xmpp_register_support_host_request.h",
-    "xsession_chooser_linux.cc",
     "xsession_chooser_ui.inc",
     "zombie_host_detector.cc",
     "zombie_host_detector.h",
@@ -369,45 +315,59 @@ static_library("common") {
     libs += [ "pam" ]
   }
 
-  if (use_x11) {
+  if (use_x11 && (!is_chromeos || !use_ozone)) {
+    sources += [
+      "clipboard_x11.cc",
+      "desktop_resizer_x11.cc",
+      "desktop_resizer_x11.h",
+      "input_injector_x11.cc",
+    ]
     deps += [
       "//remoting/host/linux:x11",
       "//ui/events/platform/x11",
       "//ui/gfx/x",
     ]
-    if (is_desktop_linux) {
+    if (is_linux) {
       deps += [ "//build/config/linux/gtk" ]
     }
-  } else {
-    sources -= [
-      "clipboard_x11.cc",
-      "desktop_resizer_x11.cc",
-      "desktop_resizer_x11.h",
-      "input_injector_x11.cc",
-    ]
   }
 
-  if (!use_ozone) {
-    sources -= [
+  if (use_ozone && !is_chromeos) {
+    sources += [
       "desktop_resizer_ozone.cc",
       "desktop_resizer_ozone.h",
     ]
   }
 
-  if (is_chromeos) {
-    # TODO(GYP): crbug.com/481627. These should only be included
-    # when enable_me2me_host is true.
-    sources -= [
+  if (is_linux || is_chromeos) {
+    sources += [
+      "pairing_registry_delegate_linux.cc",
+      "pairing_registry_delegate_linux.h",
+      "resources_linux.cc",
+    ]
+  }
+
+  if (is_linux && !is_chromeos) {
+    sources += [
       "audio_capturer_linux.cc",
       "audio_capturer_linux.h",
       "continue_window_linux.cc",
       "curtain_mode_linux.cc",
       "disconnect_window_linux.cc",
       "keyboard_layout_monitor_linux.cc",
-      "me2me_desktop_environment.cc",
-      "me2me_desktop_environment.h",
       "xsession_chooser_linux.cc",
     ]
+  }
+
+  if (is_chromeos) {
+    sources += [
+      "audio_capturer_chromeos.cc",
+      "continue_window_chromeos.cc",
+      "disconnect_window_chromeos.cc",
+      "input_injector_chromeos.cc",
+      "input_injector_chromeos.h",
+      "keyboard_layout_monitor_chromeos.cc",
+    ]
     deps += [
       "//ash",
       "//remoting/host/chromeos",
@@ -416,22 +376,30 @@ static_library("common") {
 
     if (use_ozone) {
       deps += [ "//ui/ozone" ]
-      sources -= [
-        "desktop_resizer_ozone.cc",
-        "desktop_resizer_ozone.h",
-      ]
-    } else {
-      sources -= [
-        "clipboard_x11.cc",
-        "desktop_resizer_x11.cc",
-        "desktop_resizer_x11.h",
-        "input_injector_chromeos.cc",
-        "input_injector_chromeos.h",
-      ]
     }
+  } else {
+    sources += [
+      "me2me_desktop_environment.cc",
+      "me2me_desktop_environment.h",
+    ]
   }
 
   if (is_mac) {
+    sources += [
+      "audio_capturer_mac.cc",
+      "clipboard_mac.mm",
+      "continue_window_mac.mm",
+      "curtain_mode_mac.cc",
+      "desktop_display_info_mac.mm",
+      "desktop_resizer_mac.cc",
+      "disconnect_window_mac.h",
+      "disconnect_window_mac.mm",
+      "input_injector_mac.cc",
+      "keyboard_layout_monitor_mac.cc",
+      "pairing_registry_delegate_mac.cc",
+      "resources_mac.cc",
+      "usage_stats_consent_mac.cc",
+    ]
     frameworks = [
       "Accelerate.framework",
       "Carbon.framework",
@@ -441,6 +409,28 @@ static_library("common") {
   }
 
   if (is_win) {
+    sources += [
+      "audio_capturer_win.cc",
+      "audio_capturer_win.h",
+      "clipboard_win.cc",
+      "continue_window_win.cc",
+      "curtain_mode_win.cc",
+      "daemon_process_win.cc",
+      "desktop_resizer_win.cc",
+      "desktop_session_win.cc",
+      "desktop_session_win.h",
+      "disconnect_window_win.cc",
+      "host_event_logger_win.cc",
+      "input_injector_win.cc",
+      "keyboard_layout_monitor_win.cc",
+      "pairing_registry_delegate_win.cc",
+      "pairing_registry_delegate_win.h",
+      "resources_win.cc",
+      "sas_injector_win.cc",
+      "touch_injector_win.cc",
+      "touch_injector_win.h",
+      "usage_stats_consent_win.cc",
+    ]
     libs += [ "crypt32.lib" ]
     deps += [
       # On Windows, we use //media/gpu/MediaFoundationVideoEncodeAcceleratorWin
@@ -523,8 +513,6 @@ source_set("unit_tests") {
     "mouse_shape_pump_unittest.cc",
     "native_messaging/native_messaging_reader_unittest.cc",
     "native_messaging/native_messaging_writer_unittest.cc",
-    "pairing_registry_delegate_linux_unittest.cc",
-    "pairing_registry_delegate_win_unittest.cc",
     "pin_hash_unittest.cc",
     "policy_watcher_unittest.cc",
     "process_stats_sender_unittest.cc",
@@ -539,7 +527,6 @@ source_set("unit_tests") {
     "third_party_auth_config_unittest.cc",
     "token_validator_base_unittest.cc",
     "token_validator_factory_impl_unittest.cc",
-    "touch_injector_win_unittest.cc",
     "xmpp_register_support_host_request_unittest.cc",
     "zombie_host_detector_unittest.cc",
   ]
@@ -566,6 +553,10 @@ source_set("unit_tests") {
     "//testing/gtest",
   ]
 
+  if (is_linux || is_chromeos) {
+    sources += [ "pairing_registry_delegate_linux_unittest.cc" ]
+  }
+
   if (is_linux && !is_chromeos) {
     deps += [ "//remoting/host/linux:unit_tests" ]
   }
@@ -578,6 +569,10 @@ source_set("unit_tests") {
   }
 
   if (is_win) {
+    sources += [
+      "pairing_registry_delegate_win_unittest.cc",
+      "touch_injector_win_unittest.cc",
+    ]
     deps += [ "//remoting/host/win:unit_tests" ]
   }
 
@@ -635,6 +630,8 @@ if (enable_remoting_host) {
       sources += [
         "setup/host_starter.cc",
         "setup/host_starter.h",
+        "setup/host_stopper.cc",
+        "setup/host_stopper.h",
         "setup/start_host_main.cc",
         "setup/start_host_main.h",
       ]
@@ -648,7 +645,8 @@ if (enable_remoting_host) {
     }
   }
 
-  action_foreach("remoting_native_messaging_manifests") {
+  # TODO(crbug.com/1112471): Get this to run cleanly under Python 3.
+  python2_action_foreach("remoting_native_messaging_manifests") {
     if (is_mac) {
       me2me_host_path = "/Library/PrivilegedHelperTools/$me2me_host_bundle_name/Contents/MacOS/$native_messaging_host_bundle_name/Contents/MacOS/native_messaging_host"
       it2me_host_path = "/Library/PrivilegedHelperTools/$me2me_host_bundle_name/Contents/MacOS/$remote_assistance_host_bundle_name/Contents/MacOS/remote_assistance_host"
@@ -690,14 +688,18 @@ if (enable_remoting_host) {
     ]
   }
 
-  action_foreach("remoting_infoplist_strings") {
+  # TODO(crbug.com/1112471): Get this to run cleanly under Python 3.
+  python2_action_foreach("remoting_infoplist_strings") {
     sources = [
-      "installer/mac/uninstaller/remoting_uninstaller-InfoPlist.strings.jinja2",
       "it2me/remote_assistance_host-InfoPlist.strings.jinja2",
       "remoting_me2me_host-InfoPlist.strings.jinja2",
       "setup/native_messaging_host-InfoPlist.strings.jinja2",
     ]
 
+    if (is_mac) {
+      sources += [ "installer/mac/uninstaller/remoting_uninstaller-InfoPlist.strings.jinja2" ]
+    }
+
     script = "//remoting/tools/build/remoting_localize.py"
     args = [
              "--locale_dir",
@@ -759,7 +761,7 @@ if (enable_me2me_host) {
       deps += [ "//components/policy:generated" ]
     }
 
-    if (is_desktop_linux) {
+    if (is_linux) {
       deps += [ "//build/config/linux/gtk" ]
     }
     if ((is_linux && !is_chromeos) || is_mac) {
diff --git a/chromium/remoting/host/file_transfer/BUILD.gn b/chromium/remoting/host/file_transfer/BUILD.gn
index c7a9eb7e146..1733248794d 100644
--- a/chromium/remoting/host/file_transfer/BUILD.gn
+++ b/chromium/remoting/host/file_transfer/BUILD.gn
@@ -4,26 +4,8 @@
 
 import("//remoting/build/config/remoting_build.gni")
 
-# This file depends on the legacy global sources assignment filter. It should
-# be converted to check target platform before assigning source files to the
-# sources variable. Remove this import and set_sources_assignment_filter call
-# when the file has been converted. See https://crbug.com/1018739 for details.
-import("//build/config/deprecated_default_sources_assignment_filter.gni")
-set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
-
 source_set("file_transfer") {
-  sources = [
-    "ensure_user_mac.cc",
-    "ensure_user_win.cc",
-    "file_chooser_chromeos.cc",
-    "file_chooser_common_win.h",
-    "file_chooser_mac.mm",
-    "file_chooser_main_win.cc",
-    "file_chooser_win.cc",
-    "get_desktop_directory.cc",
-    "get_desktop_directory.h",
-    "get_desktop_directory_win.cc",
-  ]
+  sources = [ "get_desktop_directory.h" ]
 
   public_deps = [ ":common" ]
 
@@ -34,6 +16,10 @@ source_set("file_transfer") {
   ]
 
   if (is_mac) {
+    sources += [
+      "ensure_user_mac.cc",
+      "file_chooser_mac.mm",
+    ]
     frameworks = [ "AppKit.framework" ]
   }
 
@@ -42,13 +28,25 @@ source_set("file_transfer") {
   }
 
   if (is_win) {
-    sources -= [ "get_desktop_directory.cc" ]
+    sources += [
+      "ensure_user_win.cc",
+      "file_chooser_common_win.h",
+      "file_chooser_main_win.cc",
+      "file_chooser_win.cc",
+      "get_desktop_directory_win.cc",
+    ]
+  } else {
+    sources += [ "get_desktop_directory.cc" ]
   }
 
-  if (is_desktop_linux) {
+  if (is_linux) {
     sources += [ "file_chooser_linux.cc" ]
     deps += [ "//build/config/linux/gtk" ]
   }
+
+  if (is_chromeos) {
+    sources += [ "file_chooser_chromeos.cc" ]
+  }
 }
 
 source_set("common") {
diff --git a/chromium/remoting/host/input_monitor/BUILD.gn b/chromium/remoting/host/input_monitor/BUILD.gn
index 68f3bf6152c..ffd195a2c73 100644
--- a/chromium/remoting/host/input_monitor/BUILD.gn
+++ b/chromium/remoting/host/input_monitor/BUILD.gn
@@ -4,35 +4,14 @@
 
 import("//remoting/build/config/remoting_build.gni")
 
-# This file depends on the legacy global sources assignment filter. It should
-# be converted to check target platform before assigning source files to the
-# sources variable. Remove this import and set_sources_assignment_filter call
-# when the file has been converted. See https://crbug.com/1018739 for details.
-import("//build/config/deprecated_default_sources_assignment_filter.gni")
-set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
-
 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_mac.mm",
-    "local_mouse_input_monitor_win.cc",
-    "local_mouse_input_monitor_x11.cc",
     "local_pointer_input_monitor.h",
-    "local_pointer_input_monitor_chromeos.cc",
   ]
 
   deps = [
@@ -46,14 +25,37 @@ source_set("input_monitor") {
   }
 
   if (is_mac) {
+    sources += [
+      "local_hotkey_input_monitor_mac.mm",
+      "local_keyboard_input_monitor_mac.mm",
+      "local_mouse_input_monitor_mac.mm",
+    ]
     deps += [ "//third_party/google_toolbox_for_mac" ]
   }
 
-  if (!use_x11 || (is_chromeos && !use_ozone)) {
-    sources -= [
+  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",
     ]
   }
+
+  if (is_win) {
+    sources += [
+      "local_hotkey_input_monitor_win.cc",
+      "local_input_monitor_win.cc",
+      "local_input_monitor_win.h",
+      "local_keyboard_input_monitor_win.cc",
+      "local_mouse_input_monitor_win.cc",
+    ]
+  }
+
+  if (is_chromeos) {
+    sources += [
+      "local_hotkey_input_monitor_chromeos.cc",
+      "local_keyboard_input_monitor_chromeos.cc",
+      "local_pointer_input_monitor_chromeos.cc",
+    ]
+  }
 }
diff --git a/chromium/remoting/host/installer/BUILD.gn b/chromium/remoting/host/installer/BUILD.gn
index d50709ef58f..7ced17f4461 100644
--- a/chromium/remoting/host/installer/BUILD.gn
+++ b/chromium/remoting/host/installer/BUILD.gn
@@ -2,9 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/python.gni")
 import("//remoting/build/config/remoting_build.gni")
 
-action("credits") {
+# TODO(crbug.com/1112471): Get this to run cleanly under Python 3.
+python2_action("credits") {
   # We put this in $root_build_dir/gen/remoting instead of
   # $root_build_dir/gen/remoting/host (target_gen_dir) for
   # compatibility w/ GYP, since the installer needs the file to
diff --git a/chromium/remoting/host/installer/mac/BUILD.gn b/chromium/remoting/host/installer/mac/BUILD.gn
index d1ec6349240..fae0ad40243 100644
--- a/chromium/remoting/host/installer/mac/BUILD.gn
+++ b/chromium/remoting/host/installer/mac/BUILD.gn
@@ -2,18 +2,13 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/python.gni")
 import("//build/config/zip.gni")
 import("//chrome/installer/mac/mac_signing_sources.gni")
 import("//remoting/build/config/remoting_build.gni")
 
-# This file depends on the legacy global sources assignment filter. It should
-# be converted to check target platform before assigning source files to the
-# sources variable. Remove this import and set_sources_assignment_filter call
-# when the file has been converted. See https://crbug.com/1018739 for details.
-import("//build/config/deprecated_default_sources_assignment_filter.gni")
-set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
-
-action("remoting_me2me_host_archive") {
+# TODO(crbug.com/1112471): Get this to run cleanly under Python 3.
+python2_action("remoting_me2me_host_archive") {
   _installer_mac_files = [
     "do_signing.sh",
     "do_signing.props",
diff --git a/chromium/remoting/host/installer/win/BUILD.gn b/chromium/remoting/host/installer/win/BUILD.gn
index b4eaec9a5c1..46fb2b5004e 100644
--- a/chromium/remoting/host/installer/win/BUILD.gn
+++ b/chromium/remoting/host/installer/win/BUILD.gn
@@ -2,10 +2,12 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/python.gni")
 import("//remoting/build/config/remoting_build.gni")
 import("//remoting/host/installer/win/generate_clsids.gni")
 
-action("remoting_me2me_host_archive") {
+# TODO(crbug.com/1112471): Get this to run cleanly under Python 3.
+python2_action("remoting_me2me_host_archive") {
   script = "//remoting/host/installer/build-installer-archive.py"
 
   sources = [ "//build/android/gyp/util/build_utils.py" ]
diff --git a/chromium/remoting/host/it2me/BUILD.gn b/chromium/remoting/host/it2me/BUILD.gn
index 7035f316a4a..bf3679c4b34 100644
--- a/chromium/remoting/host/it2me/BUILD.gn
+++ b/chromium/remoting/host/it2me/BUILD.gn
@@ -16,31 +16,31 @@ if (is_mac) {
   import("//third_party/icu/config.gni")
 }
 
-# This file depends on the legacy global sources assignment filter. It should
-# be converted to check target platform before assigning source files to the
-# sources variable. Remove this import and set_sources_assignment_filter call
-# when the file has been converted. See https://crbug.com/1018739 for details.
-import("//build/config/deprecated_default_sources_assignment_filter.gni")
-set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
-
 source_set("common") {
   sources = [
     "it2me_confirmation_dialog.h",
-    "it2me_confirmation_dialog_linux.cc",
-    "it2me_confirmation_dialog_mac.mm",
     "it2me_confirmation_dialog_proxy.cc",
     "it2me_confirmation_dialog_proxy.h",
-    "it2me_confirmation_dialog_win.cc",
     "it2me_host.cc",
     "it2me_host.h",
     "it2me_native_messaging_host.cc",
     "it2me_native_messaging_host.h",
   ]
 
+  if (is_linux && !is_chromeos) {
+    sources += [ "it2me_confirmation_dialog_linux.cc" ]
+  }
+
   if (is_chromeos) {
     sources += [ "it2me_confirmation_dialog_chromeos.cc" ]
+  }
 
-    sources -= [ "it2me_confirmation_dialog_linux.cc" ]
+  if (is_mac) {
+    sources += [ "it2me_confirmation_dialog_mac.mm" ]
+  }
+
+  if (is_win) {
+    sources += [ "it2me_confirmation_dialog_win.cc" ]
   }
 
   configs += [
@@ -58,7 +58,7 @@ source_set("common") {
     "//remoting/resources",
     "//remoting/signaling",
   ]
-  if (is_desktop_linux) {
+  if (is_linux) {
     deps += [
       "//build/config/linux/gtk",
 
@@ -234,7 +234,7 @@ if (!is_chromeos && enable_remoting_host) {
         }
       }
 
-      if (is_desktop_linux) {
+      if (is_linux) {
         deps += [ "//build/config/linux/gtk" ]
       }
     }
diff --git a/chromium/remoting/host/linux/BUILD.gn b/chromium/remoting/host/linux/BUILD.gn
index eafed2b2c7e..95d6e764a6a 100644
--- a/chromium/remoting/host/linux/BUILD.gn
+++ b/chromium/remoting/host/linux/BUILD.gn
@@ -79,7 +79,7 @@ source_set("linux") {
   if (use_x11) {
     deps += [ ":x11" ]
   }
-  if (is_desktop_linux) {
+  if (is_linux) {
     deps += [ "//build/config/linux/gtk" ]
   }
 }
diff --git a/chromium/remoting/host/security_key/BUILD.gn b/chromium/remoting/host/security_key/BUILD.gn
index 762201e12a6..49bb2b3e596 100644
--- a/chromium/remoting/host/security_key/BUILD.gn
+++ b/chromium/remoting/host/security_key/BUILD.gn
@@ -4,17 +4,9 @@
 
 import("//remoting/build/config/remoting_build.gni")
 
-# This file depends on the legacy global sources assignment filter. It should
-# be converted to check target platform before assigning source files to the
-# sources variable. Remove this import and set_sources_assignment_filter call
-# when the file has been converted. See https://crbug.com/1018739 for details.
-import("//build/config/deprecated_default_sources_assignment_filter.gni")
-set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
-
 source_set("security_key") {
   sources = [
     "security_key_auth_handler.h",
-    "security_key_auth_handler_win.cc",
     "security_key_extension.cc",
     "security_key_extension.h",
     "security_key_extension_session.cc",
@@ -52,6 +44,10 @@ source_set("security_key") {
   if (is_posix) {
     sources += [ "security_key_auth_handler_posix.cc" ]
   }
+
+  if (is_win) {
+    sources += [ "security_key_auth_handler_win.cc" ]
+  }
 }
 
 source_set("main") {
@@ -95,7 +91,6 @@ source_set("unit_tests") {
   testonly = true
 
   sources = [
-    "security_key_auth_handler_win_unittest.cc",
     "security_key_extension_session_unittest.cc",
     "security_key_ipc_client_unittest.cc",
     "security_key_ipc_server_unittest.cc",
@@ -113,6 +108,10 @@ source_set("unit_tests") {
   if (is_posix) {
     sources += [ "security_key_auth_handler_posix_unittest.cc" ]
   }
+
+  if (is_win) {
+    sources += [ "security_key_auth_handler_win_unittest.cc" ]
+  }
 }
 
 static_library("test_support") {
diff --git a/chromium/remoting/host/setup/BUILD.gn b/chromium/remoting/host/setup/BUILD.gn
index b8db816b6de..e2f9f5c0181 100644
--- a/chromium/remoting/host/setup/BUILD.gn
+++ b/chromium/remoting/host/setup/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.
 
-# This file depends on the legacy global sources assignment filter. It should
-# be converted to check target platform before assigning source files to the
-# sources variable. Remove this import and set_sources_assignment_filter call
-# when the file has been converted. See https://crbug.com/1018739 for details.
-import("//build/config/deprecated_default_sources_assignment_filter.gni")
-set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
-
 source_set("setup") {
   public_deps = [ ":common" ]
   deps = [ "//remoting/host" ]
@@ -18,12 +11,6 @@ source_set("common") {
   sources = [
     "daemon_controller.cc",
     "daemon_controller.h",
-    "daemon_controller_delegate_linux.cc",
-    "daemon_controller_delegate_linux.h",
-    "daemon_controller_delegate_mac.h",
-    "daemon_controller_delegate_mac.mm",
-    "daemon_controller_delegate_win.cc",
-    "daemon_controller_delegate_win.h",
     "me2me_native_messaging_host.cc",
     "me2me_native_messaging_host.h",
     "pin_validator.cc",
@@ -52,7 +39,18 @@ source_set("common") {
     "//services/network/public/mojom",
   ]
 
+  if (is_linux || is_chromeos) {
+    sources += [
+      "daemon_controller_delegate_linux.cc",
+      "daemon_controller_delegate_linux.h",
+    ]
+  }
+
   if (is_mac) {
+    sources += [
+      "daemon_controller_delegate_mac.h",
+      "daemon_controller_delegate_mac.mm",
+    ]
     deps += [ "//remoting/host/mac:permission_checking" ]
   }
 
@@ -61,6 +59,10 @@ source_set("common") {
   }
 
   if (is_win) {
+    sources += [
+      "daemon_controller_delegate_win.cc",
+      "daemon_controller_delegate_win.h",
+    ]
     deps += [ "//remoting/host/win:remoting_lib_idl" ]
   }
 }
diff --git a/chromium/remoting/host/win/BUILD.gn b/chromium/remoting/host/win/BUILD.gn
index 8f527a22284..f97eceb3be0 100644
--- a/chromium/remoting/host/win/BUILD.gn
+++ b/chromium/remoting/host/win/BUILD.gn
@@ -154,6 +154,9 @@ source_set("unit_tests") {
   sources = [
     "elevated_native_messaging_host.cc",
     "elevated_native_messaging_host.h",
+    "event_trace_data.cc",
+    "event_trace_data.h",
+    "event_trace_data_unittest.cc",
     "launch_native_messaging_host_process.cc",
     "launch_native_messaging_host_process.h",
     "rdp_client_unittest.cc",
@@ -176,24 +179,13 @@ source_set("unit_tests") {
   ]
 }
 
-action("generate_idl") {
-  script = "//build/util/version.py"
-
-  inputs = [ "chromoting_lib_idl.templ" ]
-  outputs = [ "$target_gen_dir/chromoting_lib.idl" ]
-
-  args = [
-    "-e",
-    "RDP_DESKTOP_SESSION_CLSID='$rdp_desktop_session_clsid'",
-    rebase_path(inputs[0], root_build_dir),
-    rebase_path(outputs[0], root_build_dir),
-  ]
-}
+RDP_DESKTOP_SESSION_PLACEHOLDER_CLSID =
+    "PLACEHOLDER-GUID-6741fd0a-6a8a-5838-a35e-8088697e2088"
 
 midl("remoting_lib_idl") {
-  sources = get_target_outputs(":generate_idl")
-  dynamic_guid = rdp_desktop_session_clsid
-  deps = [ ":generate_idl" ]
+  sources = [ "chromoting_lib.templ" ]
+  dynamic_guids =
+      "$RDP_DESKTOP_SESSION_PLACEHOLDER_CLSID=$rdp_desktop_session_clsid"
   writes_tlb = true
 }
 
@@ -218,8 +210,8 @@ config("MIDL_config") {
 
 static_library("remoting_lib_ps") {
   sources = [
-    "$root_gen_dir/remoting/host/win/chromoting_lib.dlldata.c",
-    "$root_gen_dir/remoting/host/win/chromoting_lib_p.c",
+    "$target_gen_dir/chromoting_lib.dlldata.c",
+    "$target_gen_dir/chromoting_lib_p.c",
   ]
 
   configs -= [ "//build/config/compiler:chromium_code" ]
@@ -359,6 +351,8 @@ shared_library("remoting_core") {
     "//remoting/host/it2me/it2me_native_messaging_host_main.h",
     "//remoting/host/setup/host_starter.cc",
     "//remoting/host/setup/host_starter.h",
+    "//remoting/host/setup/host_stopper.cc",
+    "//remoting/host/setup/host_stopper.h",
     "//remoting/host/setup/me2me_native_messaging_host_main.cc",
     "//remoting/host/setup/me2me_native_messaging_host_main.h",
     "//remoting/host/setup/start_host_main.cc",
@@ -372,6 +366,15 @@ shared_library("remoting_core") {
     "core_resource.h",
     "elevated_native_messaging_host.cc",
     "elevated_native_messaging_host.h",
+    "etw_trace_consumer.cc",
+    "etw_trace_consumer.h",
+    "etw_trace_controller.cc",
+    "etw_trace_controller.h",
+    "event_trace_data.cc",
+    "event_trace_data.h",
+    "host_event_file_logger.cc",
+    "host_event_file_logger.h",
+    "host_event_logger.h",
     "host_service.cc",
     "host_service.h",
     "launch_native_messaging_host_process.cc",
diff --git a/chromium/remoting/ios/app/resources/BUILD.gn b/chromium/remoting/ios/app/resources/BUILD.gn
index 0e1d763be0b..700d36d0430 100644
--- a/chromium/remoting/ios/app/resources/BUILD.gn
+++ b/chromium/remoting/ios/app/resources/BUILD.gn
@@ -5,6 +5,7 @@
 import("//build/config/chrome_build.gni")
 import("//build/config/ios/asset_catalog.gni")
 import("//build/config/ios/rules.gni")
+import("//build/config/python.gni")
 import("//remoting/build/config/remoting_build.gni")
 import("//remoting/remoting_locales.gni")
 
@@ -87,7 +88,8 @@ appiconset("remoting_icons") {
 
 # i18n
 
-action("infoplist_strings") {
+# TODO(crbug.com/1112471): Get this to run cleanly under Python 3.
+python2_action("infoplist_strings") {
   _source = "InfoPlist.strings.jinja2"
   sources = [ _source ]
 
diff --git a/chromium/remoting/resources/BUILD.gn b/chromium/remoting/resources/BUILD.gn
index b0ba1bf4051..868d23702e3 100644
--- a/chromium/remoting/resources/BUILD.gn
+++ b/chromium/remoting/resources/BUILD.gn
@@ -2,13 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/python.gni")
 import("//remoting/remoting_locales.gni")
 import("//tools/grit/grit_rule.gni")
 
-if (is_android) {
-  import("//build/config/android/rules.gni")
-}
-
 group("resources") {
   public_deps = [
     ":copy_locales",
@@ -17,7 +14,8 @@ group("resources") {
   ]
 }
 
-action("verify_resources") {
+# TODO(crbug.com/1112471): Get this to run cleanly under Python 3.
+python2_action("verify_resources") {
   script = "//remoting/tools/verify_resources.py"
 
   sources_to_verify = [
@@ -86,7 +84,8 @@ if (is_android) {
   }
 }
 
-action("copy_locales") {
+# TODO(crbug.com/1112471): Get this to run cleanly under Python 3.
+python2_action("copy_locales") {
   script = "../tools/build/remoting_copy_locales.py"
 
   # The gyp build calls out to Python, but the Python just computes a simple
diff --git a/chromium/remoting/test/BUILD.gn b/chromium/remoting/test/BUILD.gn
index 3d04281a932..019a97eb9ad 100644
--- a/chromium/remoting/test/BUILD.gn
+++ b/chromium/remoting/test/BUILD.gn
@@ -136,7 +136,7 @@ if (enable_remoting_host && !is_android && !is_chromeos) {
 
     deps = [ ":it2me_standalone_host" ]
 
-    if (is_desktop_linux) {
+    if (is_linux) {
       deps += [ "//build/config/linux/gtk" ]
     }
 
diff --git a/chromium/remoting/tools/build/remoting_localize.gni b/chromium/remoting/tools/build/remoting_localize.gni
index a0dbb8cc277..a0bdb4cce7f 100644
--- a/chromium/remoting/tools/build/remoting_localize.gni
+++ b/chromium/remoting/tools/build/remoting_localize.gni
@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/python.gni")
+
 # Calls the remoting_localize script with a jinja2 template.
 #
 # Arguments
@@ -33,7 +35,8 @@
 #   deps (optional)
 #   visibility (optional)
 template("remoting_localize") {
-  action_foreach(target_name) {
+  # TODO(crbug.com/1112471): Get this to run cleanly under Python 3.
+  python2_action_foreach(target_name) {
     if (defined(invoker.visibility)) {
       visibility = invoker.visibility
     }