BASELINE: Update Chromium to 90.0.4430.221

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

1 files changed, 92 insertions, 30 deletions

diff --git a/chromium/remoting/host/BUILD.gn b/chromium/remoting/host/BUILD.gn
index c44741d9b65..ef3c4674848 100644
--- a/chromium/remoting/host/BUILD.gn
+++ b/chromium/remoting/host/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.
 
+import("//build/config/chromeos/ui_mode.gni")
 import("//build/config/python.gni")
 import("//build/util/process_version.gni")
 import("//remoting/build/config/remoting_build.gni")
@@ -24,7 +25,7 @@ group("all") {
     deps += [ ":remoting_host_branded" ]
   }
 
-  if (!is_chromeos && !is_android && !is_ios) {
+  if (!is_chromeos_ash && !is_android && !is_ios) {
     deps += [
       "//remoting/host:remoting_native_messaging_host",
       "//remoting/host:remoting_native_messaging_manifests",
@@ -73,6 +74,41 @@ source_set("base") {
   }
 }
 
+# Split up from common to avoid circular dependency.
+source_set("client_session_control") {
+  sources = [ "client_session_control.h" ]
+
+  deps = [ "//remoting/protocol" ]
+}
+
+source_set("clipboard") {
+  sources = [ "clipboard.h" ]
+
+  deps = [
+    ":base",
+    "//base",
+    "//remoting/proto",
+    "//remoting/protocol",
+  ]
+
+  if (use_x11 && (!is_chromeos_ash || !use_ozone)) {
+    sources += [ "clipboard_x11.cc" ]
+
+    deps += [
+      "//remoting/host/linux:x11",
+      "//ui/gfx/x",
+    ]
+  }
+
+  if (is_mac) {
+    sources += [ "clipboard_mac.mm" ]
+  }
+
+  if (is_win) {
+    sources += [ "clipboard_win.cc" ]
+  }
+}
+
 # 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
@@ -109,9 +145,7 @@ static_library("common") {
     "chromoting_param_traits_impl.h",
     "client_session.cc",
     "client_session.h",
-    "client_session_control.h",
     "client_session_details.h",
-    "clipboard.h",
     "config_file_watcher.cc",
     "config_file_watcher.h",
     "config_watcher.h",
@@ -173,6 +207,9 @@ static_library("common") {
     "host_power_save_blocker.h",
     "host_secret.cc",
     "host_secret.h",
+    "host_setting_keys.h",
+    "host_settings.cc",
+    "host_settings.h",
     "host_status_logger.cc",
     "host_status_logger.h",
     "host_status_monitor.cc",
@@ -267,8 +304,11 @@ static_library("common") {
 
   deps = [
     ":base",
+    ":client_session_control",
+    ":clipboard",
     "//base:i18n",
     "//build:branding_buildflags",
+    "//build:chromeos_buildflags",
     "//components/policy/core/common",
     "//crypto",
     "//google_apis",
@@ -309,15 +349,26 @@ static_library("common") {
     deps += [ "//components/policy:generated" ]
   }
 
-  if (is_linux && !is_chromeos) {
-    sources += [ "desktop_resizer_linux.cc" ]
-    public_deps += [ "//remoting/host/linux" ]
+  if (is_linux && !is_chromeos_lacros) {
+    sources += [
+      "desktop_resizer_linux.cc",
+      "linux/audio_pipe_reader.cc",
+      "linux/audio_pipe_reader.h",
+      "linux/certificate_watcher.cc",
+      "linux/certificate_watcher.h",
+    ]
+
     libs += [ "pam" ]
+
+    deps += [ "//build/config/linux/gtk" ]
+
+    if (use_x11) {
+      deps += [ "linux:x11" ]
+    }
   }
 
-  if (use_x11 && (!is_chromeos || !use_ozone)) {
+  if (use_x11 && ((!is_chromeos_ash && !is_chromeos_lacros) || !use_ozone)) {
     sources += [
-      "clipboard_x11.cc",
       "desktop_resizer_x11.cc",
       "desktop_resizer_x11.h",
       "input_injector_x11.cc",
@@ -327,27 +378,30 @@ static_library("common") {
       "//ui/events/platform/x11",
       "//ui/gfx/x",
     ]
-    if (is_linux) {
+    if (is_linux && !is_chromeos_lacros) {
       deps += [ "//build/config/linux/gtk" ]
     }
   }
 
-  if (use_ozone && !is_chromeos) {
+  if (use_ozone && !is_chromeos_ash && !is_chromeos_lacros) {
     sources += [
       "desktop_resizer_ozone.cc",
       "desktop_resizer_ozone.h",
     ]
   }
 
-  if (is_linux || is_chromeos) {
+  if (is_linux && !is_chromeos_lacros) {
     sources += [
       "pairing_registry_delegate_linux.cc",
       "pairing_registry_delegate_linux.h",
-      "resources_linux.cc",
     ]
   }
 
-  if (is_linux && !is_chromeos) {
+  if (is_linux || is_chromeos) {
+    sources += [ "resources_linux.cc" ]
+  }
+
+  if (is_linux && !is_chromeos_lacros) {
     sources += [
       "audio_capturer_linux.cc",
       "audio_capturer_linux.h",
@@ -359,7 +413,7 @@ static_library("common") {
     ]
   }
 
-  if (is_chromeos) {
+  if (is_chromeos_ash) {
     sources += [
       "audio_capturer_chromeos.cc",
       "continue_window_chromeos.cc",
@@ -375,7 +429,10 @@ static_library("common") {
     ]
 
     if (use_ozone) {
-      deps += [ "//ui/ozone" ]
+      deps += [
+        "//ui/events/ozone/layout",
+        "//ui/ozone",
+      ]
     }
   } else {
     sources += [
@@ -387,13 +444,15 @@ static_library("common") {
   if (is_mac) {
     sources += [
       "audio_capturer_mac.cc",
-      "clipboard_mac.mm",
+      "audio_capturer_mac.h",
       "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",
+      "host_settings_mac.cc",
+      "host_settings_mac.h",
       "input_injector_mac.cc",
       "keyboard_layout_monitor_mac.cc",
       "pairing_registry_delegate_mac.cc",
@@ -403,16 +462,20 @@ static_library("common") {
     frameworks = [
       "Accelerate.framework",
       "Carbon.framework",
+      "CoreAudio.framework",
     ]
 
-    deps += [ ":remoting_version" ]
+    deps += [
+      ":remoting_version",
+      "//remoting/host/mac:constants",
+      "//remoting/host/mac:permission_checking",
+    ]
   }
 
   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",
@@ -531,7 +594,7 @@ source_set("unit_tests") {
     "zombie_host_detector_unittest.cc",
   ]
 
-  if (use_ozone || is_chromeos) {
+  if (use_ozone || is_chromeos_ash) {
     sources -= [ "input_monitor/local_input_monitor_unittest.cc" ]
   }
 
@@ -541,6 +604,7 @@ source_set("unit_tests") {
     ":common",
     ":test_support",
     "//build:branding_buildflags",
+    "//build:chromeos_buildflags",
     "//remoting/host/file_transfer:unit_tests",
     "//remoting/host/it2me:common",
     "//remoting/host/native_messaging",
@@ -553,19 +617,16 @@ source_set("unit_tests") {
     "//testing/gtest",
   ]
 
-  if (is_linux || is_chromeos) {
+  if (is_linux && !is_chromeos) {
     sources += [ "pairing_registry_delegate_linux_unittest.cc" ]
   }
 
-  if (is_linux && !is_chromeos) {
+  if (is_linux && !is_chromeos_lacros) {
     deps += [ "//remoting/host/linux:unit_tests" ]
   }
 
-  if (is_chromeos) {
-    deps += [
-      "//remoting/host/chromeos:unit_tests",
-      "//remoting/host/linux",  # for AudioPipeReader
-    ]
+  if (is_chromeos_ash) {
+    deps += [ "//remoting/host/chromeos:unit_tests" ]
   }
 
   if (is_win) {
@@ -622,7 +683,7 @@ if (enable_remoting_host) {
                 [ "REMOTING_HOST_BINARY=BINARY_REMOTING_START_HOST" ]
 
       deps += [
-        "//build/win:default_exe_manifest",
+        "//remoting/host/win:elevated_exe_manifest",
         "//remoting/host/win:remoting_core",
         "//remoting/host/win:remoting_windows_resources",
       ]
@@ -761,10 +822,10 @@ if (enable_me2me_host) {
       deps += [ "//components/policy:generated" ]
     }
 
-    if (is_linux) {
+    if (is_linux || is_chromeos_lacros) {
       deps += [ "//build/config/linux/gtk" ]
     }
-    if ((is_linux && !is_chromeos) || is_mac) {
+    if (is_linux || is_chromeos_lacros || is_mac) {
       libs = [ "pam" ]
     }
 
@@ -824,7 +885,8 @@ if (enable_me2me_host) {
       }
     }
   }
-  if (is_chrome_branded && enable_me2me_host && is_linux && !is_chromeos) {
+  if (is_chrome_branded && enable_me2me_host &&
+      (is_linux || is_chromeos_lacros)) {
     group("remoting_me2me_host_archive") {
       deps = [ "//remoting/host/installer/linux:remoting_me2me_host_archive" ]
     }