BASELINE: Update Chromium to 85.0.4183.14085-based

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

5 files changed, 15 insertions, 17 deletions

diff --git a/chromium/remoting/host/chromeos/BUILD.gn b/chromium/remoting/host/chromeos/BUILD.gn
index b518aae2c4a..963db809a67 100644
--- a/chromium/remoting/host/chromeos/BUILD.gn
+++ b/chromium/remoting/host/chromeos/BUILD.gn
@@ -29,13 +29,16 @@ source_set("chromeos") {
     "//skia",
     "//third_party/webrtc_overrides:webrtc_component",
     "//ui/aura",
-    "//ui/base/cursor",
+    "//ui/base/cursor:cursor_base",
     "//ui/compositor",
     "//ui/events",
     "//ui/views",
   ]
 
-  deps = [ "//ui/base/cursor/mojom:cursor_type" ]
+  deps = [
+    "//ui/base/cursor",
+    "//ui/base/cursor/mojom:cursor_type",
+  ]
 }
 
 # The host portions of the remoting unit tests.
diff --git a/chromium/remoting/host/win/BUILD.gn b/chromium/remoting/host/win/BUILD.gn
index 3ae19f3695a..8f527a22284 100644
--- a/chromium/remoting/host/win/BUILD.gn
+++ b/chromium/remoting/host/win/BUILD.gn
@@ -137,6 +137,7 @@ source_set("win") {
     "//remoting/resources",
     "//services/device/wake_lock/power_save_blocker",
     "//third_party/webrtc_overrides:webrtc_component",
+    "//third_party/wtl",
     "//ui/base",
     "//ui/events:dom_keycode_converter",
     "//ui/events/platform",
diff --git a/chromium/remoting/ios/BUILD.gn b/chromium/remoting/ios/BUILD.gn
index 9f0191e3f15..88fcd9231b2 100644
--- a/chromium/remoting/ios/BUILD.gn
+++ b/chromium/remoting/ios/BUILD.gn
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//ios/third_party/features.gni")
 import("//remoting/build/config/remoting_build.gni")
 import("//remoting/remoting_locales.gni")
 
@@ -76,6 +75,7 @@ test("ios_remoting_unittests") {
   deps = [
     "//base/test:run_all_unittests",
     "//base/test:test_support",
+    "//ios/third_party/material_components_ios:material_components_ios+link",
     "//remoting/ios/audio:unit_tests",
     "//remoting/ios/facade:unit_tests",
     "//remoting/ios/persistence:unit_tests",
@@ -85,13 +85,9 @@ test("ios_remoting_unittests") {
     deps += [ ":unittests_locale_${locale}_bundle_data" ]
   }
 
-  if (ios_third_party_material_components_built_as_framework) {
-    deps += [
-      "//ios/third_party/material_components_ios:material_components_ios+link",
-    ]
-
-    bundle_deps = [ "//ios/third_party/material_components_ios:material_components_ios+bundle" ]
-  }
+  bundle_deps = [
+    "//ios/third_party/material_components_ios:material_components_ios+bundle",
+  ]
 }
 
 foreach(locale, remoting_locales_with_underscores) {
diff --git a/chromium/remoting/ios/app/BUILD.gn b/chromium/remoting/ios/app/BUILD.gn
index 1275ad00711..dd41ee4c118 100644
--- a/chromium/remoting/ios/app/BUILD.gn
+++ b/chromium/remoting/ios/app/BUILD.gn
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//ios/third_party/features.gni")
 import("//remoting/build/config/remoting_build.gni")
 import("//remoting/ios/app/remoting_ios_tmpl.gni")
 
@@ -145,14 +144,12 @@ ios_remoting_app_tmpl("ios_remoting_app") {
   entitlements_path = "resources/Remoting.entitlements"
   deps = [
     ":app_source_set",
+    "//ios/third_party/material_components_ios:material_components_ios+link",
     "//remoting/ios/app/resources:launchscreen_assets",
     "//remoting/ios/app/resources:remoting_icons",
   ]
 
-  if (ios_third_party_material_components_built_as_framework) {
-    deps += [
-      "//ios/third_party/material_components_ios:material_components_ios+link",
-    ]
-    bundle_deps = [ "//ios/third_party/material_components_ios:material_components_ios+bundle" ]
-  }
+  bundle_deps = [
+    "//ios/third_party/material_components_ios:material_components_ios+bundle",
+  ]
 }
diff --git a/chromium/remoting/protocol/BUILD.gn b/chromium/remoting/protocol/BUILD.gn
index a313727021d..af723968d48 100644
--- a/chromium/remoting/protocol/BUILD.gn
+++ b/chromium/remoting/protocol/BUILD.gn
@@ -131,6 +131,7 @@ static_library("protocol") {
     "pairing_host_authenticator.h",
     "pairing_registry.cc",
     "pairing_registry.h",
+    "peer_connection_controls.h",
     "performance_tracker.cc",
     "performance_tracker.h",
     "port_allocator.cc",