BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 5 insertions, 1 deletions

diff --git a/chromium/device/fido/make_credential_task.cc b/chromium/device/fido/make_credential_task.cc
index 4cb8ca45cde..04ac74c937c 100644
--- a/chromium/device/fido/make_credential_task.cc
+++ b/chromium/device/fido/make_credential_task.cc
@@ -28,6 +28,10 @@ namespace {
 bool CtapDeviceShouldUseU2fBecauseClientPinIsSet(
     const FidoDevice* device,
     const CtapMakeCredentialRequest& request) {
+  if (!IsConvertibleToU2fRegisterCommand(request)) {
+    return false;
+  }
+
   DCHECK_EQ(device->supported_protocol(), ProtocolVersion::kCtap2);
   // Don't use U2F for requests that require UV or PIN which U2F doesn't
   // support. Note that |pin_auth| may also be set by GetTouchRequest(), but we
@@ -79,7 +83,7 @@ CtapMakeCredentialRequest MakeCredentialTask::GetTouchRequest(
       std::move(user),
       PublicKeyCredentialParams(
           {{CredentialType::kPublicKey,
-            base::strict_cast<int>(CoseAlgorithmIdentifier::kCoseEs256)}}));
+            base::strict_cast<int>(CoseAlgorithmIdentifier::kEs256)}}));
 
   // If a device supports CTAP2 and has PIN support then setting an empty
   // pinAuth should trigger just a touch[1]. Our U2F code also understands