Extend biometric reauth histograms

The following histograms end dates were extended:
- Android.DeviceAuthenticator.CanAuthenticateWithBiometric
- PasswordManager.BiometricAuthPwdFill.AuthResult

PasswordManager.BiometricAuthPwdFill.CanAuthenticate was removed because
Android.DeviceAuthenticator.CanAuthenticateWithBiometrics reports the
same thing (the later was introduced to replace the earlier one because
the name of the histogram didn't reflect its usage).

Bug: 379691229, 367340924
Change-Id: Icfc26a7b30082f5cf25000a60d834c7b1f079dfe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6177032
Commit-Queue: Anna Tsvirchkova <atsvirchkova@google.com>
Reviewed-by: Ioana Pandele <ioanap@chromium.org>
Reviewed-by: Michael van Ouwerkerk <mvanouwerkerk@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1407313}

chrome/browser/device_reauth/android/device_authenticator_android.cc

@@ -76,11 +76,6 @@ void LogCanAuthenticate(BiometricsAvailability availability) {
   base::UmaHistogramEnumeration(
       "Android.DeviceAuthenticator.CanAuthenticateWithBiometrics",
       availability);
-  // TODO (crbug.com/350658581): Remove this histogram in favor of the above
-  // because its name is misleading. Keeping now to track
-  // `DeviceAuthenticatorAndroidx` experiment.
-  base::UmaHistogramEnumeration(
-      "PasswordManager.BiometricAuthPwdFill.CanAuthenticate", availability);
 }
 
 }  // namespace

chrome/browser/device_reauth/android/device_authenticator_android_unittest.cc

@@ -89,7 +89,7 @@ TEST_F(DeviceAuthenticatorAndroidTest, CanAuthenticateCallsBridge) {
   EXPECT_TRUE(authenticator()->CanAuthenticateWithBiometrics());
 
   histogram_tester.ExpectUniqueSample(
-      "PasswordManager.BiometricAuthPwdFill.CanAuthenticate",
+      "Android.DeviceAuthenticator.CanAuthenticateWithBiometrics",
       BiometricsAvailability::kAvailable, 1);
 }
 
@@ -103,7 +103,7 @@ TEST_F(
   EXPECT_TRUE(authenticator()->CanAuthenticateWithBiometricOrScreenLock());
 
   histogram_tester.ExpectTotalCount(
-      "PasswordManager.BiometricAuthPwdFill.CanAuthenticate", 0);
+      "Android.DeviceAuthenticator.CanAuthenticateWithBiometrics", 0);
 }
 
 TEST_F(DeviceAuthenticatorAndroidTest, AuthenticateRecordsSource) {

tools/metrics/histograms/metadata/android/histograms.xml

@@ -1268,7 +1268,7 @@ chromium-metrics-reviews@google.com.
 </histogram>
 
 <histogram name="Android.DeviceAuthenticator.CanAuthenticateWithBiometrics"
-    enum="BiometricsAvailability" expires_after="2025-01-01">
+    enum="BiometricsAvailability" expires_after="2025-09-30">
   <owner>ioanap@chromium.org</owner>
   <owner>friedrichh@chromium.org</owner>
   <owner>atsvirchkova@google.com</owner>

tools/metrics/histograms/metadata/password/histograms.xml

@@ -930,24 +930,15 @@ chromium-metrics-reviews@google.com.
 </histogram>
 
 <histogram name="PasswordManager.BiometricAuthPwdFill.AuthResult"
-    enum="DeviceAuthFinalResult" expires_after="2024-10-28">
+    enum="DeviceAuthFinalResult" expires_after="2025-09-30">
   <owner>ioanap@chromium.org</owner>
   <owner>friedrichh@chromium.org</owner>
   <summary>
     Records the result of the attempt to re-auth the user via biometrics when
     filling a password or signing in from the account chooser dialog. From M97,
     CancelledByChrome is recorded when the auth is cancelled and before the auth
-    result actually returns.
+    result actually returns. Warning: this histogram was expired from 2024-10-28
-  </summary>
+    to 2025-01-16; data may be missing.
-</histogram>
-
-<histogram name="PasswordManager.BiometricAuthPwdFill.CanAuthenticate"
-    enum="BiometricsAvailability" expires_after="2025-02-10">
-  <owner>ioanap@chromium.org</owner>
-  <owner>friedrichh@chromium.org</owner>
-  <summary>
-    Recorded whenever a password filling surface or the account chooser dialog
-    checks whether it can use biometrics to re-authenticate the user.
   </summary>
 </histogram>