BASELINE: Update Chromium to 85.0.4183.14085-based

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

5 files changed, 7 insertions, 6 deletions

diff --git a/chromium/device/fido/mac/fake_keychain.mm b/chromium/device/fido/mac/fake_keychain.mm
index 1230468a89d..7d6892f2579 100644
--- a/chromium/device/fido/mac/fake_keychain.mm
+++ b/chromium/device/fido/mac/fake_keychain.mm
@@ -6,6 +6,7 @@
 
 #include "device/fido/mac/fake_keychain.h"
 
+#include "base/notreached.h"
 #include "device/fido/mac/keychain.h"
 
 namespace device {
diff --git a/chromium/device/fido/mac/make_credential_operation.mm b/chromium/device/fido/mac/make_credential_operation.mm
index 71ee5d4fc3f..fc27e4413fa 100644
--- a/chromium/device/fido/mac/make_credential_operation.mm
+++ b/chromium/device/fido/mac/make_credential_operation.mm
@@ -48,7 +48,7 @@ void MakeCredentialOperation::Run() {
   auto is_es256 =
       [](const PublicKeyCredentialParams::CredentialInfo& cred_info) {
         return cred_info.algorithm ==
-               static_cast<int>(CoseAlgorithmIdentifier::kCoseEs256);
+               static_cast<int>(CoseAlgorithmIdentifier::kEs256);
       };
   const auto& key_params =
       request_.public_key_credential_params.public_key_credential_params();
@@ -147,7 +147,7 @@ void MakeCredentialOperation::PromptTouchIdDone(bool success) {
       AttestationObject(
           std::move(authenticator_data),
           std::make_unique<PackedAttestationStatement>(
-              CoseAlgorithmIdentifier::kCoseEs256, std::move(*signature),
+              CoseAlgorithmIdentifier::kEs256, std::move(*signature),
               /*x509_certificates=*/std::vector<std::vector<uint8_t>>())));
   std::move(callback_).Run(CtapDeviceResponseCode::kSuccess,
                            std::move(response));
diff --git a/chromium/device/fido/mac/touch_id_context.mm b/chromium/device/fido/mac/touch_id_context.mm
index 220354da77b..f9af4eb253a 100644
--- a/chromium/device/fido/mac/touch_id_context.mm
+++ b/chromium/device/fido/mac/touch_id_context.mm
@@ -129,9 +129,9 @@ bool TouchIdContext::TouchIdAvailableImpl(const AuthenticatorConfig& config) {
   }
 
   base::scoped_nsobject<LAContext> context([[LAContext alloc] init]);
-  base::scoped_nsobject<NSError> nserr;
+  NSError* nserr;
   if (![context canEvaluatePolicy:LAPolicyDeviceOwnerAuthentication
-                            error:nserr.InitializeInto()]) {
+                            error:&nserr]) {
     FIDO_LOG(DEBUG) << "canEvaluatePolicy failed: " << nserr;
     return false;
   }
diff --git a/chromium/device/fido/mac/util.mm b/chromium/device/fido/mac/util.mm
index 624081c4366..57c2e272306 100644
--- a/chromium/device/fido/mac/util.mm
+++ b/chromium/device/fido/mac/util.mm
@@ -55,7 +55,7 @@ std::unique_ptr<PublicKey> SecKeyRefToECPublicKey(SecKeyRef public_key_ref)
   base::span<const uint8_t> key_data =
       base::make_span(CFDataGetBytePtr(data_ref), CFDataGetLength(data_ref));
   auto key = P256PublicKey::ParseX962Uncompressed(
-      static_cast<int32_t>(CoseAlgorithmIdentifier::kCoseEs256), key_data);
+      static_cast<int32_t>(CoseAlgorithmIdentifier::kEs256), key_data);
   if (!key) {
     LOG(ERROR) << "Unexpected public key format: "
                << base::HexEncode(key_data.data(), key_data.size());
diff --git a/chromium/device/fido/mac/util_unittest.cc b/chromium/device/fido/mac/util_unittest.cc
index 322509b5871..3d6c9d41b50 100644
--- a/chromium/device/fido/mac/util_unittest.cc
+++ b/chromium/device/fido/mac/util_unittest.cc
@@ -23,7 +23,7 @@ namespace {
 
 std::unique_ptr<PublicKey> TestKey() {
   return P256PublicKey::ParseX962Uncompressed(
-      static_cast<int32_t>(CoseAlgorithmIdentifier::kCoseEs256),
+      static_cast<int32_t>(CoseAlgorithmIdentifier::kEs256),
       test_data::kX962UncompressedPublicKey);
 }