Signin cleanup: Remove unused Autologin prefs
The prefs kAutologinEnabled and kReverseAutologinRejectedEmailList were
unused.
Bug: none
Change-Id: I802726a0cc507b7a862b02e6bef595237225b177
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5571340
Commit-Queue: Marc Treib <[email protected]>
Code-Coverage: [email protected] <[email protected]>
Reviewed-by: David Roger <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1306361}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 9584a18..3241493 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1098,6 +1098,11 @@
inline constexpr char kSyncCachedTrustedVaultAutoUpgradeDebugInfo[] =
"sync.cached_trusted_vault_auto_upgrade_debug_info";
+// Deprecated 05/2024.
+inline constexpr char kAutologinEnabled[] = "autologin.enabled";
+inline constexpr char kReverseAutologinRejectedEmailList[] =
+ "reverse_autologin.rejected_email_list";
+
// Register local state used only for migration (clearing or moving to a new
// key).
void RegisterLocalStatePrefsForMigration(PrefRegistrySimple* registry) {
@@ -1582,6 +1587,10 @@
// Deprecated 05/2024.
registry->RegisterStringPref(kSyncCachedTrustedVaultAutoUpgradeDebugInfo, "");
+
+ // Deprecated 05/2024.
+ registry->RegisterBooleanPref(kAutologinEnabled, true);
+ registry->RegisterListPref(kReverseAutologinRejectedEmailList);
}
void ClearSyncRequestedPrefAndMaybeMigrate(PrefService* profile_prefs) {
@@ -2951,6 +2960,10 @@
// Added 05/2024.
profile_prefs->ClearPref(kSyncCachedTrustedVaultAutoUpgradeDebugInfo);
+ // Added 05/2024.
+ profile_prefs->ClearPref(kAutologinEnabled);
+ profile_prefs->ClearPref(kReverseAutologinRejectedEmailList);
+
// Please don't delete the following line. It is used by PRESUBMIT.py.
// END_MIGRATE_OBSOLETE_PROFILE_PREFS
diff --git a/chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc b/chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc
index 25302a2..5eeb3e1 100644
--- a/chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc
+++ b/chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc
@@ -272,16 +272,6 @@
pref_service->SetBoolean(prefs::kSigninAllowed, enable);
}
-void InlineLoginUIBrowserTest::AddEmailToOneClickRejectedList(
- const std::string& email) {
- PrefService* pref_service = browser()->profile()->GetPrefs();
- ScopedListPrefUpdate updater(pref_service,
- prefs::kReverseAutologinRejectedEmailList);
- if (!base::Contains(*updater, base::Value(email))) {
- updater->Append(email);
- }
-}
-
void InlineLoginUIBrowserTest::AllowSigninCookies(bool enable) {
content_settings::CookieSettings* cookie_settings =
CookieSettingsFactory::GetForProfile(browser()->profile()).get();
@@ -386,18 +376,6 @@
"[email protected]"));
}
-IN_PROC_BROWSER_TEST_F(InlineLoginUIBrowserTest, CanOfferWithRejectedEmail) {
- EnableSigninAllowed(true);
-
- AddEmailToOneClickRejectedList("[email protected]");
- AddEmailToOneClickRejectedList("[email protected]");
-
- EXPECT_TRUE(
- CanOfferSignin(browser()->profile(), "12345", "[email protected]").IsOk());
- EXPECT_TRUE(
- CanOfferSignin(browser()->profile(), "12345", "[email protected]").IsOk());
-}
-
IN_PROC_BROWSER_TEST_F(InlineLoginUIBrowserTest, CanOfferNoSigninCookies) {
AllowSigninCookies(false);
EnableSigninAllowed(true);
