[Code Health] Remove >1 year old deprecated prefs
Bug: None
Change-Id: I3b8b5887b29596cf184d99650f3a023234cf7671
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5352602
Reviewed-by: Marc Treib <[email protected]>
Commit-Queue: Mariam Ali <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1270830}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index bfdbe07..37a0d97 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -552,34 +552,7 @@
// Please keep the list of deprecated prefs in chronological order. i.e. Add to
// the bottom of the list, not here at the top.
-// Deprecated 03/2023.
-const char kGoogleSearchDomainMixingMetricsEmitterLastMetricsTime[] =
- "browser.last_google_search_domain_mixing_metrics_time";
-
-// Deprecated 03/2023.
-#if BUILDFLAG(IS_CHROMEOS_ASH)
-const char kGlanceablesSignoutScreenshotDuration[] =
- "ash.signout_screenshot.duration";
-#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-
-// Deprecated 03/2023.
-#if BUILDFLAG(IS_CHROMEOS_ASH)
-const char kEasyUnlockLocalStateUserPrefs[] = "easy_unlock.user_prefs";
-#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-
-// Deprecated 03/2023.
-#if BUILDFLAG(IS_CHROMEOS_ASH)
-const char kDarkLightModeNudgeLeftToShowCount[] =
- "ash.dark_light_mode.educational_nudge";
-#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-
-// Deprecated 03/2023.
-#if BUILDFLAG(IS_WIN)
-const char kWebAuthnLastOperationWasNativeAPI[] =
- "webauthn.last_op_used_native_api";
-#endif
-
-// Deprecated 03/2023.
+// Deprecated 04/2023.
#if BUILDFLAG(IS_CHROMEOS_ASH)
const char kEasyUnlockHardlockState[] = "easy_unlock.hardlock_state";
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -1033,17 +1006,6 @@
// Register local state used only for migration (clearing or moving to a new
// key).
void RegisterLocalStatePrefsForMigration(PrefRegistrySimple* registry) {
-// Deprecated 03/2023.
-#if BUILDFLAG(IS_CHROMEOS_ASH)
- registry->RegisterTimeDeltaPref(kGlanceablesSignoutScreenshotDuration,
- base::TimeDelta());
-#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-
-// Deprecated 03/2023.
-#if BUILDFLAG(IS_CHROMEOS_ASH)
- registry->RegisterDictionaryPref(kEasyUnlockLocalStateUserPrefs);
-#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-
// Deprecated 04/2023.
#if BUILDFLAG(IS_CHROMEOS_ASH)
registry->RegisterDictionaryPref(kEasyUnlockHardlockState);
@@ -1159,21 +1121,6 @@
user_prefs::PrefRegistrySyncable* registry) {
chrome_browser_net::secure_dns::RegisterProbesSettingBackupPref(registry);
- // Deprecated 03/2023.
- registry->RegisterTimePref(
- kGoogleSearchDomainMixingMetricsEmitterLastMetricsTime, base::Time());
-
- // Deprecated 03/2023.
-#if BUILDFLAG(IS_CHROMEOS_ASH)
- registry->RegisterIntegerPref(kDarkLightModeNudgeLeftToShowCount,
- ash::kDarkLightModeNudgeMaxShownCount);
-#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-
- // Deprecated 03/2023.
-#if BUILDFLAG(IS_WIN)
- registry->RegisterBooleanPref(kWebAuthnLastOperationWasNativeAPI, false);
-#endif
-
// Deprecated 04/2023.
#if BUILDFLAG(IS_CHROMEOS_ASH)
registry->RegisterBooleanPref(kBentoBarEnabled, false);
@@ -2224,16 +2171,6 @@
// BEGIN_MIGRATE_OBSOLETE_LOCAL_STATE_PREFS
// Please don't delete the preceding line. It is used by PRESUBMIT.py.
-// Added 03/2023.
-#if BUILDFLAG(IS_CHROMEOS_ASH)
- local_state->ClearPref(kGlanceablesSignoutScreenshotDuration);
-#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-
-// Added 03/2023.
-#if BUILDFLAG(IS_CHROMEOS_ASH)
- local_state->ClearPref(kEasyUnlockLocalStateUserPrefs);
-#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-
// Added 04/2023.
#if BUILDFLAG(IS_CHROMEOS_ASH)
local_state->ClearPref(kEasyUnlockHardlockState);
@@ -2389,25 +2326,6 @@
}
}
-// Added 03/2023.
-#if BUILDFLAG(IS_CHROMEOS_ASH)
- ash::ambient::prefs::MigrateDeprecatedPrefs(*profile_prefs);
-#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-
- // Added 03/2023.
- profile_prefs->ClearPref(
- kGoogleSearchDomainMixingMetricsEmitterLastMetricsTime);
-
-// Added 03/2023.
-#if BUILDFLAG(IS_CHROMEOS_ASH)
- profile_prefs->ClearPref(kDarkLightModeNudgeLeftToShowCount);
-#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-
- // Added 03/2023.
-#if BUILDFLAG(IS_WIN)
- profile_prefs->ClearPref(kWebAuthnLastOperationWasNativeAPI);
-#endif
-
// Added 04/2023.
#if BUILDFLAG(IS_CHROMEOS_ASH)
profile_prefs->ClearPref(kBentoBarEnabled);
