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

Unified Diff: chrome/browser/prefs/tracked/tracked_preferences_migration.h

Issue 324493002: Move preference MACs to the protected preference stores. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comment typo. Created 6 years, 6 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: chrome/browser/prefs/tracked/tracked_preferences_migration.h
diff --git a/chrome/browser/prefs/tracked/tracked_preferences_migration.h b/chrome/browser/prefs/tracked/tracked_preferences_migration.h
index 348f844cc00a7bb0ee62c5b5ac80367a830d3fe4..f27fb578dcb3f25d5cf06da7ee9934222784d681 100644
--- a/chrome/browser/prefs/tracked/tracked_preferences_migration.h
+++ b/chrome/browser/prefs/tracked/tracked_preferences_migration.h
@@ -9,8 +9,12 @@
#include <string>
#include "base/callback_forward.h"
+#include "base/memory/scoped_ptr.h"
+#include "chrome/browser/prefs/pref_hash_store.h"
+class HashStoreContents;
class InterceptablePrefFilter;
+class PrefHashStore;
// Sets up InterceptablePrefFilter::FilterOnLoadInterceptors on
// |unprotected_pref_filter| and |protected_pref_filter| which prevents each
@@ -19,8 +23,12 @@ class InterceptablePrefFilter;
// (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. 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| 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).
void SetupTrackedPreferencesMigration(
const std::set<std::string>& unprotected_pref_names,
const std::set<std::string>& protected_pref_names,
@@ -31,6 +39,9 @@ void SetupTrackedPreferencesMigration(
register_on_successful_unprotected_store_write_callback,
const base::Callback<void(const base::Closure&)>&
register_on_successful_protected_store_write_callback,
+ scoped_ptr<PrefHashStore> unprotected_pref_hash_store,
+ scoped_ptr<PrefHashStore> protected_pref_hash_store,
+ scoped_ptr<HashStoreContents> legacy_pref_hash_store,
InterceptablePrefFilter* unprotected_pref_filter,
InterceptablePrefFilter* protected_pref_filter);

Powered by Google App Engine
This is Rietveld 408576698