Commit 7d9f0b90 authored by Erik Chen's avatar Erik Chen Committed by Chromium LUCI CQ

Delete old pref deletions.

This CL deletes 1+ year old code for removing old prefs.

Change-Id: Id56e4fc76f342933cef3116222587abe033f142f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2611500
Commit-Queue: Erik Chen <erikchen@chromium.org>
Reviewed-by: default avatarGabriel Charette <gab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#840907}
parent a97ffaf8
......@@ -410,17 +410,7 @@
namespace {
// Deprecated 9/2019
const char kGoogleServicesUsername[] = "google.services.username";
const char kGoogleServicesUserAccountId[] = "google.services.user_account_id";
const char kDataReductionNetworkProperties[] =
"data_reduction.network_properties";
#if BUILDFLAG(IS_CHROMEOS_ASH)
// Deprecated 10/2019
const char kDisplayRotationAcceleratorDialogHasBeenAccepted[] =
"settings.a11y.display_rotation_accelerator_dialog_has_been_accepted";
// Deprecated 12/2020
const char kLocalSearchServiceSyncMetricsDailySample[] =
"local_search_service_sync.metrics.daily_sample";
......@@ -431,10 +421,6 @@ const char kLocalSearchServiceSyncMetricsHelpAppCount[] =
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
// Deprecated 11/2019
const char kBlacklistedCredentialsNormalized[] =
"profile.blacklisted_credentials_normalized";
// Deprecated 1/2020
#if defined(OS_MAC)
const char kKeyCreated[] = "os_crypt.key_created";
......@@ -449,6 +435,10 @@ const char kInvalidatorClientId[] = "invalidator.client_id";
const char kInvalidatorInvalidationState[] = "invalidator.invalidation_state";
const char kInvalidatorSavedInvalidations[] = "invalidator.saved_invalidations";
// Deprecated 3/2020
const char kDataReductionNetworkProperties[] =
"data_reduction.network_properties";
#if BUILDFLAG(IS_CHROMEOS_ASH)
// Deprecated 4/2020
const char kAmbientModeTopicSource[] = "settings.ambient_mode.topic_source";
......@@ -564,18 +554,12 @@ void RegisterLocalStatePrefsForMigration(PrefRegistrySimple* registry) {
// Register prefs used only for migration (clearing or moving to a new key).
void RegisterProfilePrefsForMigration(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterStringPref(kGoogleServicesUsername, std::string());
registry->RegisterStringPref(kGoogleServicesUserAccountId, std::string());
registry->RegisterDictionaryPref(kDataReductionNetworkProperties);
#if BUILDFLAG(IS_CHROMEOS_ASH)
registry->RegisterBooleanPref(
kDisplayRotationAcceleratorDialogHasBeenAccepted, false);
registry->RegisterDictionaryPref(kSupervisedUserAllowlists);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
registry->RegisterBooleanPref(kBlacklistedCredentialsNormalized, false);
registry->RegisterBooleanPref(kGCMChannelStatus, true);
registry->RegisterIntegerPref(kGCMChannelPollIntervalSeconds, 0);
registry->RegisterInt64Pref(kGCMChannelLastCheckTime, 0);
......@@ -1192,18 +1176,6 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
// disable sync.
syncer::MigrateSyncSuppressedPref(profile_prefs);
// Added 9/2019
profile_prefs->ClearPref(kGoogleServicesUsername);
profile_prefs->ClearPref(kGoogleServicesUserAccountId);
#if BUILDFLAG(IS_CHROMEOS_ASH)
// Added 10/2019.
profile_prefs->ClearPref(kDisplayRotationAcceleratorDialogHasBeenAccepted);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
// Added 11/2019.
profile_prefs->ClearPref(kBlacklistedCredentialsNormalized);
// Added 1/2020.
profile_prefs->ClearPref(kGCMChannelStatus);
profile_prefs->ClearPref(kGCMChannelPollIntervalSeconds);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment