BASELINE: Update Chromium to 85.0.4183.14085-based

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

4 files changed, 156 insertions, 4 deletions

diff --git a/chromium/chromeos/dbus/BUILD.gn b/chromium/chromeos/dbus/BUILD.gn
index 713a31bc17a..2da0820b1fd 100644
--- a/chromium/chromeos/dbus/BUILD.gn
+++ b/chromium/chromeos/dbus/BUILD.gn
@@ -24,8 +24,10 @@ component("dbus") {
   ]
   deps = [
     ":anomaly_detector_proto",
+    ":chunneld_proto",
     ":cicerone_proto",
     ":concierge_proto",
+    ":lorgnette_proto",
     ":metrics_event_proto",
     ":oobe_config_proto",
     ":plugin_vm_service_proto",
@@ -34,6 +36,7 @@ component("dbus") {
     ":smbprovider_proto",
     ":update_engine_proto",
     ":vm_applications_apps_proto",
+    ":vm_permission_service_proto",
     ":vm_plugin_dispatcher_proto",
     "//base",
     "//components/account_id",
@@ -55,10 +58,10 @@ component("dbus") {
     "arc_midis_client.h",
     "arc_obb_mounter_client.cc",
     "arc_obb_mounter_client.h",
-    "arc_oemcrypto_client.cc",
-    "arc_oemcrypto_client.h",
     "cec_service_client.cc",
     "cec_service_client.h",
+    "chunneld_client.cc",
+    "chunneld_client.h",
     "cicerone_client.cc",
     "cicerone_client.h",
     "concierge_client.cc",
@@ -84,10 +87,10 @@ component("dbus") {
     "fake_arc_midis_client.h",
     "fake_arc_obb_mounter_client.cc",
     "fake_arc_obb_mounter_client.h",
-    "fake_arc_oemcrypto_client.cc",
-    "fake_arc_oemcrypto_client.h",
     "fake_cec_service_client.cc",
     "fake_cec_service_client.h",
+    "fake_chunneld_client.cc",
+    "fake_chunneld_client.h",
     "fake_cicerone_client.cc",
     "fake_cicerone_client.h",
     "fake_concierge_client.cc",
@@ -211,6 +214,7 @@ source_set("unit_tests") {
     "//chromeos/dbus/cryptohome",
     "//chromeos/dbus/cryptohome:attestation_proto",
     "//chromeos/dbus/dlcservice:test_support",
+    "//chromeos/dbus/hermes:test_support",
     "//chromeos/dbus/ip_peripheral:test_support",
     "//chromeos/dbus/power:power_manager_proto",
     "//chromeos/dbus/power:test_support",
@@ -250,6 +254,13 @@ proto_library("anomaly_detector_proto") {
   proto_out_dir = "chromeos/dbus/anomaly_detector"
 }
 
+proto_library("chunneld_proto") {
+  sources =
+      [ "//third_party/cros_system_api/dbus/chunneld/chunneld_service.proto" ]
+
+  proto_out_dir = "chromeos/dbus/chunneld"
+}
+
 proto_library("cicerone_proto") {
   sources = [
     "//third_party/cros_system_api/dbus/vm_cicerone/cicerone_service.proto",
@@ -266,6 +277,13 @@ proto_library("concierge_proto") {
   proto_out_dir = "chromeos/dbus/concierge"
 }
 
+proto_library("lorgnette_proto") {
+  sources =
+      [ "//third_party/cros_system_api/dbus/lorgnette/lorgnette_service.proto" ]
+
+  proto_out_dir = "chromeos/dbus/lorgnette"
+}
+
 proto_library("metrics_event_proto") {
   sources =
       [ "//third_party/cros_system_api/dbus/metrics_event/metrics_event.proto" ]
@@ -324,6 +342,12 @@ proto_library("vm_applications_apps_proto") {
   proto_out_dir = "chromeos/dbus/vm_applications"
 }
 
+proto_library("vm_permission_service_proto") {
+  sources = [ "//third_party/cros_system_api/dbus/vm_permission_service/vm_permission_service.proto" ]
+
+  proto_out_dir = "chromeos/dbus/vm_permission_service"
+}
+
 proto_library("vm_plugin_dispatcher_proto") {
   sources = [ "//third_party/cros_system_api/dbus/vm_plugin_dispatcher/vm_plugin_dispatcher.proto" ]
 
diff --git a/chromium/chromeos/dbus/attestation/BUILD.gn b/chromium/chromeos/dbus/attestation/BUILD.gn
new file mode 100644
index 00000000000..c8fdf7d2ebf
--- /dev/null
+++ b/chromium/chromeos/dbus/attestation/BUILD.gn
@@ -0,0 +1,35 @@
+# Copyright 2020 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("//third_party/protobuf/proto_library.gni")
+
+assert(is_chromeos, "Non-ChromeOS builds cannot depend on //chromeos")
+
+component("attestation") {
+  output_name = "chromeos_dbus_attestation"
+  defines = [ "IS_CHROMEOS_DBUS_ATTESTATION_IMPL" ]
+
+  deps = [
+    ":attestation_proto",
+    "//base",
+    "//dbus",
+  ]
+
+  sources = [
+    "attestation_client.cc",
+    "attestation_client.h",
+    "fake_attestation_client.cc",
+    "fake_attestation_client.h",
+  ]
+}
+
+proto_library("attestation_proto") {
+  sources = [
+    "//third_party/cros_system_api/dbus/attestation/attestation_ca.proto",
+    "//third_party/cros_system_api/dbus/attestation/interface.proto",
+    "//third_party/cros_system_api/dbus/attestation/keystore.proto",
+  ]
+
+  proto_out_dir = "chromeos/dbus/attestation"
+}
diff --git a/chromium/chromeos/dbus/cdm_factory_daemon/BUILD.gn b/chromium/chromeos/dbus/cdm_factory_daemon/BUILD.gn
new file mode 100644
index 00000000000..3fbfde27583
--- /dev/null
+++ b/chromium/chromeos/dbus/cdm_factory_daemon/BUILD.gn
@@ -0,0 +1,21 @@
+# Copyright 2020 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.
+
+assert(is_chromeos, "Non-ChromeOS builds cannot depend on //chromeos")
+
+component("cdm_factory_daemon") {
+  defines = [ "IS_CDM_FACTORY_DAEMON_IMPL" ]
+
+  deps = [
+    "//base",
+    "//dbus",
+  ]
+
+  sources = [
+    "cdm_factory_daemon_client.cc",
+    "cdm_factory_daemon_client.h",
+    "fake_cdm_factory_daemon_client.cc",
+    "fake_cdm_factory_daemon_client.h",
+  ]
+}
diff --git a/chromium/chromeos/dbus/hermes/BUILD.gn b/chromium/chromeos/dbus/hermes/BUILD.gn
new file mode 100644
index 00000000000..3bfaaf3bc97
--- /dev/null
+++ b/chromium/chromeos/dbus/hermes/BUILD.gn
@@ -0,0 +1,72 @@
+# Copyright 2020 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.
+
+assert(is_chromeos, "Non-ChromeOS builds cannot depend on //chromeos")
+
+component("hermes") {
+  public_deps = [ ":hermes_clients" ]
+  deps = [ ":hermes_fakes" ]
+}
+
+source_set("hermes_clients") {
+  defines = [ "IS_HERMES_CLIENT_IMPL" ]
+  deps = [
+    "//base",
+    "//chromeos/dbus:common",
+    "//components/device_event_log",
+    "//dbus",
+  ]
+
+  sources = [
+    "hermes_clients.cc",
+    "hermes_clients.h",
+    "hermes_manager_client.cc",
+    "hermes_manager_client.h",
+    "hermes_profile_client.cc",
+    "hermes_profile_client.h",
+    "hermes_response_status.cc",
+    "hermes_response_status.h",
+  ]
+}
+
+source_set("hermes_fakes") {
+  deps = [
+    ":hermes_clients",
+    "//base",
+    "//chromeos/dbus/constants",
+    "//chromeos/dbus/shill",
+    "//dbus",
+  ]
+
+  sources = [
+    "fake_hermes_manager_client.cc",
+    "fake_hermes_manager_client.h",
+    "fake_hermes_profile_client.cc",
+    "fake_hermes_profile_client.h",
+  ]
+
+  allow_circular_includes_from = [ ":hermes_clients" ]
+}
+
+source_set("test_support") {
+  testonly = true
+  public_deps = [ ":hermes" ]
+  deps = [
+    "//base",
+    "//base/test:test_support",
+    "//chromeos/dbus:common",
+    "//dbus:test_support",
+    "//testing/gmock",
+    "//testing/gtest",
+  ]
+
+  sources = [
+    "hermes_client_test_base.cc",
+    "hermes_client_test_base.h",
+    "hermes_manager_client_unittest.cc",
+    "hermes_profile_client_unittest.cc",
+    "hermes_test_utils.cc",
+    "hermes_test_utils.h",
+  ]
+}