Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(773)

Unified Diff: components/user_prefs/tracked/tracked_preferences_migration.h

Issue 2111253002: Clean up old legacy preference migration logic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove now unused kHashStoreId in unit test Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/user_prefs/tracked/tracked_preferences_migration.h
diff --git a/components/user_prefs/tracked/tracked_preferences_migration.h b/components/user_prefs/tracked/tracked_preferences_migration.h
index 3b5939228bbb8be5e44cfa384147a3332e9ac640..3c96668a88d50d290b925cd534d902d8f6284b9b 100644
--- a/components/user_prefs/tracked/tracked_preferences_migration.h
+++ b/components/user_prefs/tracked/tracked_preferences_migration.h
@@ -23,12 +23,11 @@ class PrefHashStore;
// (un)protected_store_cleaner| and
// |register_on_successful_(un)protected_store_write_callback| are used to do
// post-migration cleanup tasks. Those should be bound to weak pointers to avoid
-// blocking shutdown. |(un)protected_pref_hash_store| and
-// |legacy_pref_hash_store| are used to migrate MACs along with their protected
-// preferences and/or from the legacy location in Local State. Migrated MACs
-// will only be cleared from their old location in a subsequent run. The
-// migration framework is resilient to a failed cleanup (it will simply try
-// again in the next Chrome run).
+// blocking shutdown. |(un)protected_pref_hash_store| is used to migrate MACs
+// along with their protected preferences. Migrated MACs will only be cleared
+// from their old location in a subsequent run. The migration framework is
+// resilient to a failed cleanup (it will simply try again in the next Chrome
+// run).
void SetupTrackedPreferencesMigration(
const std::set<std::string>& unprotected_pref_names,
const std::set<std::string>& protected_pref_names,
@@ -41,7 +40,6 @@ void SetupTrackedPreferencesMigration(
register_on_successful_protected_store_write_callback,
std::unique_ptr<PrefHashStore> unprotected_pref_hash_store,
std::unique_ptr<PrefHashStore> protected_pref_hash_store,
- std::unique_ptr<HashStoreContents> legacy_pref_hash_store,
InterceptablePrefFilter* unprotected_pref_filter,
InterceptablePrefFilter* protected_pref_filter);

Powered by Google App Engine
This is Rietveld 408576698