Delete kUnifiedPasswordManagerLocalPasswordsMigrationWarning flag
kUnifiedPasswordManagerLocalPasswordsMigrationWarning was *disabled*
by default in M132 (https://crrev.com/c/5928711, http://cl/686529557).
It can be cleaned up now.
Some other leftovers are removed:
- signin::AccessPoint::kPasswordMigrationWarningAndroid
- PasswordManager.PasswordMigrationWarning.Export.* histograms.
OBSOLETE_HISTOGRAMS=The migration warning UI was removed along with its histograms.
Fixed: 413696987
Change-Id: If795de648a5694f1e6ff96d8712be7e9bfb451e0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6494366
Reviewed-by: Ryan Sultanem <[email protected]>
Auto-Submit: Victor Vianna <[email protected]>
Reviewed-by: Ivana Žužić <[email protected]>
Reviewed-by: David Roger <[email protected]>
Commit-Queue: Victor Vianna <[email protected]>
Reviewed-by: Mohamed Amir Yosef <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1453231}
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
index d902d85c..7bc25aa7 100644
--- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -386,8 +386,6 @@
&password_manager::features::kBiometricTouchToFill,
&password_manager::features::kLoginDbDeprecationAndroid,
&password_manager::features::kPasswordFormGroupedAffiliations,
- &password_manager::features::
- kUnifiedPasswordManagerLocalPasswordsMigrationWarning,
&permissions::features::kPermissionsPromptSurvey,
&permissions::features::kPermissionDedicatedCpssSettingAndroid,
&permissions::features::kPermissionSiteSettingsRadioButton,
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
index 44689f06..9c579df 100644
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -591,8 +591,6 @@
"TrackingProtectionUserBypassPwaTrigger";
public static final String TRANSLATE_MESSAGE_UI = "TranslateMessageUI";
public static final String TRANSLATE_TFLITE = "TFLiteLanguageDetectionEnabled";
- public static final String UNIFIED_PASSWORD_MANAGER_LOCAL_PWD_MIGRATION_WARNING =
- "UnifiedPasswordManagerLocalPasswordsMigrationWarning";
public static final String UNO_PHASE_2_FOLLOW_UP = "UnoPhase2FollowUp";
public static final String UPDATE_COMPOSTIROR_FOR_SURFACE_CONTROL =
"UpdateCompositorForSurfaceControl";
diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordMetricsUtil.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordMetricsUtil.java
index 1223a04..2eb642c 100644
--- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordMetricsUtil.java
+++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordMetricsUtil.java
@@ -37,20 +37,18 @@
// numeric values should never be reused.
@IntDef({
HistogramExportResult.SUCCESS,
- HistogramExportResult.USER_ABORTED,
HistogramExportResult.WRITE_FAILED,
HistogramExportResult.NO_CONSUMER,
- HistogramExportResult.NO_SCREEN_LOCK_SET_UP,
HistogramExportResult.ACTIVITY_DESTROYED,
HistogramExportResult.NUM_ENTRIES
})
@Retention(RetentionPolicy.SOURCE)
public @interface HistogramExportResult {
int SUCCESS = 0;
- int USER_ABORTED = 1;
+ // Deprecated: int USER_ABORTED = 1;
int WRITE_FAILED = 2;
int NO_CONSUMER = 3;
- int NO_SCREEN_LOCK_SET_UP = 4;
+ // Deprecated: int NO_SCREEN_LOCK_SET_UP = 4;
int ACTIVITY_DESTROYED = 5;
// If you add new values to HistogramExportResult, also update NUM_ENTRIES to match
// its new size.
@@ -58,12 +56,7 @@
}
// The prefix for the histograms, which will be used log the export flow metrics when the export
- // flow starts form the password migration warning.
- public static final String PASSWORD_MIGRATION_WARNING_EXPORT_METRICS_ID =
- "PasswordManager.PasswordMigrationWarning.Export";
-
- // The prefix for the histograms, which will be used log the export flow metrics when the export
- // flow starts form the password migration warning.
+ // flow starts from password settings.
public static final String PASSWORD_SETTINGS_EXPORT_METRICS_ID =
"PasswordManager.Settings.Export";
diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/settings/ExportFlow.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/settings/ExportFlow.java
index 2a35a12..cb7030b6 100644
--- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/settings/ExportFlow.java
+++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/settings/ExportFlow.java
@@ -6,7 +6,6 @@
import static org.chromium.build.NullUtil.assumeNonNull;
import static org.chromium.chrome.browser.access_loss.AccessLossWarningMetricsRecorder.logExportFlowLastStepMetric;
-import static org.chromium.chrome.browser.flags.ChromeFeatureList.UNIFIED_PASSWORD_MANAGER_LOCAL_PWD_MIGRATION_WARNING;
import static org.chromium.chrome.browser.password_manager.PasswordMetricsUtil.logPasswordsExportResult;
import android.content.ActivityNotFoundException;
@@ -30,7 +29,6 @@
import org.chromium.build.annotations.Nullable;
import org.chromium.chrome.browser.access_loss.AccessLossWarningMetricsRecorder.PasswordAccessLossWarningExportStep;
import org.chromium.chrome.browser.access_loss.PasswordAccessLossWarningType;
-import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.password_manager.PasswordMetricsUtil;
import org.chromium.chrome.browser.password_manager.PasswordMetricsUtil.HistogramExportResult;
import org.chromium.chrome.browser.password_manager.R;
@@ -284,10 +282,6 @@
.show();
// Re-enable exporting, the current one was cancelled by Chrome.
mExportState = ExportState.INACTIVE;
- if (ChromeFeatureList.isEnabled(UNIFIED_PASSWORD_MANAGER_LOCAL_PWD_MIGRATION_WARNING)) {
- logPasswordsExportResult(
- mCallerMetricsId, HistogramExportResult.NO_SCREEN_LOCK_SET_UP);
- }
maybeLogExportFlowLastStepMetric(
PasswordAccessLossWarningExportStep.NO_SCREEN_LOCK_SET_UP);
} else {
@@ -371,11 +365,6 @@
(unusedDialogInterface, button) -> {
if (button == AlertDialog.BUTTON_NEGATIVE) {
mExportState = ExportState.INACTIVE;
- if (ChromeFeatureList.isEnabled(
- UNIFIED_PASSWORD_MANAGER_LOCAL_PWD_MIGRATION_WARNING)) {
- logPasswordsExportResult(
- mCallerMetricsId, HistogramExportResult.USER_ABORTED);
- }
}
});
mProgressBarManager.show(progressBarDialogFragment, mDelegate.getFragmentManager());
@@ -420,10 +409,6 @@
@Nullable String detailedDescription,
int positiveButtonLabelId,
@HistogramExportResult int histogramExportResult) {
- if (ChromeFeatureList.isEnabled(UNIFIED_PASSWORD_MANAGER_LOCAL_PWD_MIGRATION_WARNING)) {
- logPasswordsExportResult(mCallerMetricsId, histogramExportResult);
- }
-
mErrorDialogParams = new ExportErrorDialogFragment.ErrorDialogParams();
mErrorDialogParams.positiveButtonLabelId = positiveButtonLabelId;
mErrorDialogParams.description =
diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordAccessLossExportDialogCoordinatorTest.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordAccessLossExportDialogCoordinatorTest.java
index 1027674..578712e 100644
--- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordAccessLossExportDialogCoordinatorTest.java
+++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordAccessLossExportDialogCoordinatorTest.java
@@ -78,10 +78,7 @@
@RunWith(BaseRobolectricTestRunner.class)
@Config(manifest = Config.NONE)
@DoNotBatch(reason = "The ReauthenticationManager setup should not leak between tests.")
-@DisableFeatures({
- ChromeFeatureList.UNIFIED_PASSWORD_MANAGER_LOCAL_PWD_MIGRATION_WARNING,
- ChromeFeatureList.LOGIN_DB_DEPRECATION_ANDROID
-})
+@DisableFeatures({ChromeFeatureList.LOGIN_DB_DEPRECATION_ANDROID})
public class PasswordAccessLossExportDialogCoordinatorTest {
private static final Uri TEMP_EXPORT_FILE_URI = Uri.parse("tmp/fake/test/path/file.ext");
private static final Uri SAVED_EXPORT_FILE_URI = Uri.parse("fake/test/path/file.ext");
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 9a00400..7454e42 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1096,6 +1096,10 @@
// Deprecated 04/2025.
constexpr char kObsoleteUserAcknowledgedLocalPasswordsMigrationWarning[] =
"user_acknowledged_local_passwords_migration_warning";
+
+// Deprecated 04/2025.
+constexpr char kObsoleteLocalPasswordMigrationWarningPrefsVersion[] =
+ "local_passwords_migration_warning_reset_count";
#endif
// Register local state used only for migration (clearing or moving to a new
@@ -1541,6 +1545,10 @@
// Deprecated 04/2025.
registry->RegisterBooleanPref(
kObsoleteUserAcknowledgedLocalPasswordsMigrationWarning, false);
+
+ // Deprecated 04/2025.
+ registry->RegisterIntegerPref(
+ kObsoleteLocalPasswordMigrationWarningPrefsVersion, 0);
#endif
}
@@ -2831,6 +2839,9 @@
// Added 04/2025
profile_prefs->ClearPref(
kObsoleteUserAcknowledgedLocalPasswordsMigrationWarning);
+
+ // Added 04/2025.
+ profile_prefs->ClearPref(kObsoleteLocalPasswordMigrationWarningPrefsVersion);
#endif
// Please don't delete the following line. It is used by PRESUBMIT.py.
