[go: nahoru, domu]

[WebAuthn] Remove kWebAuthnSkipSingleAccountMacOS flag

This was enabled in M116.

Bug: N/A
Change-Id: Id531e976c1bd9d775ccd68912a4e8d95eb626a5f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5189271
Reviewed-by: Adam Langley <agl@chromium.org>
Commit-Queue: Ken Buchanan <kenrb@chromium.org>
Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#1246139}
diff --git a/chrome/browser/webauthn/authenticator_request_dialog_model.cc b/chrome/browser/webauthn/authenticator_request_dialog_model.cc
index c91f740..e0e5346 100644
--- a/chrome/browser/webauthn/authenticator_request_dialog_model.cc
+++ b/chrome/browser/webauthn/authenticator_request_dialog_model.cc
@@ -892,12 +892,10 @@
               transport_availability_.recognized_credentials.front()};
         }
 #if BUILDFLAG(IS_MAC)
-        if (base::FeatureList::IsEnabled(
-                device::kWebAuthnSkipSingleAccountMacOS) &&
-            (transport_availability_.user_verification_requirement ==
-                 device::UserVerificationRequirement::kRequired ||
-             local_biometrics_override_for_testing_.value_or(
-                 device::fido::mac::DeviceHasBiometricsAvailable()))) {
+        if (transport_availability_.user_verification_requirement ==
+                device::UserVerificationRequirement::kRequired ||
+            local_biometrics_override_for_testing_.value_or(
+                device::fido::mac::DeviceHasBiometricsAvailable())) {
           // If it's not preferable to complete the request by clicking
           // "Continue" then don't show the account selection sheet.
           HideDialogAndDispatchToPlatformAuthenticator();
diff --git a/device/fido/features.cc b/device/fido/features.cc
index 20c16d4..3e7b06726d7 100644
--- a/device/fido/features.cc
+++ b/device/fido/features.cc
@@ -101,11 +101,6 @@
              "WebAuthenticationNewHybridUI",
              base::FEATURE_ENABLED_BY_DEFAULT);
 
-// Enabled in M116. Remove in or after M119.
-BASE_FEATURE(kWebAuthnSkipSingleAccountMacOS,
-             "WebAuthenticationSkipSingleAccountMacOS",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-
 // Enabled in M117. Remove in or after M120.
 BASE_FEATURE(kWebAuthConditionalUIExperimentation,
              "WebAuthenticationConditionalUIExperimentation",
diff --git a/device/fido/features.h b/device/fido/features.h
index 4496cd2..6df88f137 100644
--- a/device/fido/features.h
+++ b/device/fido/features.h
@@ -78,10 +78,6 @@
 COMPONENT_EXPORT(DEVICE_FIDO)
 BASE_DECLARE_FEATURE(kWebAuthnNewHybridUI);
 
-// Don't show the single-account sheet on macOS if Touch ID is available.
-COMPONENT_EXPORT(DEVICE_FIDO)
-BASE_DECLARE_FEATURE(kWebAuthnSkipSingleAccountMacOS);
-
 // Allow sites to opt into experimenting with conditional UI presentations.
 COMPONENT_EXPORT(DEVICE_FIDO)
 BASE_DECLARE_FEATURE(kWebAuthConditionalUIExperimentation);