BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 46 insertions, 37 deletions

diff --git a/chromium/device/BUILD.gn b/chromium/device/BUILD.gn
index 47e9e690b14..fc0f4fcc084 100644
--- a/chromium/device/BUILD.gn
+++ b/chromium/device/BUILD.gn
@@ -71,41 +71,6 @@ test("device_unittests") {
     "bluetooth/test/test_pairing_delegate.cc",
     "bluetooth/test/test_pairing_delegate.h",
     "bluetooth/uribeacon/uri_encoder_unittest.cc",
-    "fido/attestation_statement_formats_unittest.cc",
-    "fido/bio/enrollment_handler_unittest.cc",
-    "fido/ble_adapter_manager_unittest.cc",
-    "fido/cable/fido_ble_connection_unittest.cc",
-    "fido/cable/fido_ble_frames_unittest.cc",
-    "fido/cable/fido_ble_transaction_unittest.cc",
-    "fido/cable/fido_cable_device_unittest.cc",
-    "fido/cable/fido_cable_discovery_unittest.cc",
-    "fido/cable/fido_cable_handshake_handler_unittest.cc",
-    "fido/cable/v2_handshake_unittest.cc",
-    "fido/cbor_extract_unittest.cc",
-    "fido/credential_management_handler_unittest.cc",
-    "fido/ctap_request_unittest.cc",
-    "fido/ctap_response_unittest.cc",
-    "fido/fake_fido_discovery_unittest.cc",
-    "fido/fido_device_discovery_unittest.cc",
-    "fido/fido_parsing_utils_unittest.cc",
-    "fido/fido_request_handler_unittest.cc",
-    "fido/get_assertion_handler_unittest.cc",
-    "fido/get_assertion_task_unittest.cc",
-    "fido/hid/fido_hid_message_unittest.cc",
-    "fido/mac/browsing_data_deletion_unittest.mm",
-    "fido/mac/credential_metadata_unittest.cc",
-    "fido/mac/get_assertion_operation_unittest_mac.mm",
-    "fido/mac/make_credential_operation_unittest_mac.mm",
-    "fido/mac/util_unittest.cc",
-    "fido/make_credential_handler_unittest.cc",
-    "fido/make_credential_task_unittest.cc",
-    "fido/test_callback_receiver_unittest.cc",
-    "fido/u2f_command_constructor_unittest.cc",
-    "fido/u2f_register_operation_unittest.cc",
-    "fido/u2f_sign_operation_unittest.cc",
-    "fido/virtual_ctap2_device_unittest.cc",
-    "fido/virtual_u2f_device_unittest.cc",
-    "fido/win/type_conversions_unittest.cc",
     "gamepad/abstract_haptic_gamepad_unittest.cc",
     "gamepad/dualshock4_controller_unittest.cc",
     "gamepad/gamepad_blocklist_unittest.cc",
@@ -139,7 +104,6 @@ test("device_unittests") {
     "//device/bluetooth:mocks",
     "//device/bluetooth/uribeacon",
     "//device/fido",
-    "//device/fido:mocks",
     "//device/fido:test_support",
     "//device/gamepad",
     "//device/gamepad:test_helpers",
@@ -161,7 +125,50 @@ test("device_unittests") {
     "//ui/resources:ui_test_pak_data",
   ]
 
-  # U2F:
+  # Most of the FIDO implementation is not compiled in for Android.
+  if (!is_android) {
+    sources += [
+      "fido/attestation_statement_formats_unittest.cc",
+      "fido/bio/enrollment_handler_unittest.cc",
+      "fido/ble_adapter_manager_unittest.cc",
+      "fido/cable/fido_ble_connection_unittest.cc",
+      "fido/cable/fido_ble_frames_unittest.cc",
+      "fido/cable/fido_ble_transaction_unittest.cc",
+      "fido/cable/fido_cable_device_unittest.cc",
+      "fido/cable/fido_cable_discovery_unittest.cc",
+      "fido/cable/fido_cable_handshake_handler_unittest.cc",
+      "fido/cable/v2_handshake_unittest.cc",
+      "fido/cbor_extract_unittest.cc",
+      "fido/credential_management_handler_unittest.cc",
+      "fido/ctap_request_unittest.cc",
+      "fido/ctap_response_unittest.cc",
+      "fido/fake_fido_discovery_unittest.cc",
+      "fido/fido_device_discovery_unittest.cc",
+      "fido/fido_parsing_utils_unittest.cc",
+      "fido/fido_request_handler_unittest.cc",
+      "fido/get_assertion_handler_unittest.cc",
+      "fido/get_assertion_task_unittest.cc",
+      "fido/hid/fido_hid_message_unittest.cc",
+      "fido/mac/browsing_data_deletion_unittest.mm",
+      "fido/mac/credential_metadata_unittest.cc",
+      "fido/mac/get_assertion_operation_unittest_mac.mm",
+      "fido/mac/make_credential_operation_unittest_mac.mm",
+      "fido/mac/util_unittest.cc",
+      "fido/make_credential_handler_unittest.cc",
+      "fido/make_credential_task_unittest.cc",
+      "fido/test_callback_receiver_unittest.cc",
+      "fido/u2f_command_constructor_unittest.cc",
+      "fido/u2f_register_operation_unittest.cc",
+      "fido/u2f_sign_operation_unittest.cc",
+      "fido/virtual_ctap2_device_unittest.cc",
+      "fido/virtual_u2f_device_unittest.cc",
+      "fido/win/type_conversions_unittest.cc",
+    ]
+
+    deps += [ "//device/fido:mocks" ]
+  }
+
+  # FIDO HID:
   # Android doesn't compile.
   # Linux, requires udev.
   if (!is_linux_without_udev && !is_android) {
@@ -307,6 +314,8 @@ test("device_unittests") {
       "bluetooth/test/fake_gatt_device_services_result_winrt.h",
       "bluetooth/test/fake_gatt_read_result_winrt.cc",
       "bluetooth/test/fake_gatt_read_result_winrt.h",
+      "bluetooth/test/fake_gatt_session_winrt.cc",
+      "bluetooth/test/fake_gatt_session_winrt.h",
       "bluetooth/test/fake_gatt_value_changed_event_args_winrt.cc",
       "bluetooth/test/fake_gatt_value_changed_event_args_winrt.h",
       "bluetooth/test/fake_gatt_write_result_winrt.cc",