Move preference MACs to the protected preference stores.

chrome/browser/prefs/tracked/tracked_preferences_migration.h

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..94e8af9799e99295d42c34eb9406e413b047b12f 100644
--- a/chrome/browser/prefs/tracked/tracked_preferences_migration.h
+++ b/chrome/browser/prefs/tracked/tracked_preferences_migration.h
@@ -9,6 +9,9 @@
 #include <string>
 
 #include "base/callback_forward.h"
+#include "base/memory/scoped_ptr.h"
+#include "chrome/browser/prefs/pref_hash_store.h"
+#include "chrome/browser/prefs/tracked/hash_store_contents.h"

[gab, 2014/06/17 02:00:06]

Fwd-decl instead of including these here.

[erikwright (departed), 2014/06/17 19:07:24]

Done.

 
 class InterceptablePrefFilter;
 
@@ -19,8 +22,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 +38,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);