BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 3 insertions, 7 deletions

diff --git a/chromium/chrome/browser/resources/cryptotoken/enroller.js b/chromium/chrome/browser/resources/cryptotoken/enroller.js
index 4088338c9e8..12440488154 100644
--- a/chromium/chrome/browser/resources/cryptotoken/enroller.js
+++ b/chromium/chrome/browser/resources/cryptotoken/enroller.js
@@ -869,14 +869,10 @@ Enroller.prototype.doRegisterWebAuthn_ = function(appId, challenge, request) {
     return;
   }
 
-  const attestationPreference =
-      conveyancePreference(challenge) == ConveyancePreference.DIRECT ?
-      WebAuthnAttestationConveyancePreference.DIRECT :
-      WebAuthnAttestationConveyancePreference.NONE;
-
   if (!chrome.cryptotokenPrivate) {
     this.doRegisterWebAuthnContinue_(
-        appId, encodedChallenge, request, attestationPreference);
+        appId, encodedChallenge, request,
+        WebAuthnAttestationConveyancePreference.DIRECT);
     return;
   }
 
@@ -887,7 +883,7 @@ Enroller.prototype.doRegisterWebAuthn_ = function(appId, challenge, request) {
             appId, encodedChallenge, request,
             enterprise_context ?
                 WebAuthnAttestationConveyancePreference.ENTERPRISE :
-                attestationPreference);
+                WebAuthnAttestationConveyancePreference.DIRECT);
       });
 };