Move preference MACs to the protected preference stores.

chrome/browser/prefs/tracked/tracked_preferences_migration_unittest.cc

Index: chrome/browser/prefs/tracked/tracked_preferences_migration_unittest.cc
diff --git a/chrome/browser/prefs/tracked/tracked_preferences_migration_unittest.cc b/chrome/browser/prefs/tracked/tracked_preferences_migration_unittest.cc
index 1c93a39fc0920e8cdfb6c93dc9538add9f755c5c..20a948f2f1ad217548d6b1fef54b50afc6a32e61 100644
--- a/chrome/browser/prefs/tracked/tracked_preferences_migration_unittest.cc
+++ b/chrome/browser/prefs/tracked/tracked_preferences_migration_unittest.cc
@@ -11,8 +11,14 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/prefs/testing_pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/interceptable_pref_filter.h"
+#include "chrome/browser/prefs/pref_hash_store.h"
+#include "chrome/browser/prefs/pref_hash_store_impl.h"
+#include "chrome/browser/prefs/profile_pref_store_manager.h"
+#include "chrome/browser/prefs/tracked/hash_store_contents.h"
+#include "chrome/browser/prefs/tracked/pref_service_hash_store_contents.h"
 #include "chrome/browser/prefs/tracked/tracked_preferences_migration.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -41,7 +47,7 @@ class SimpleInterceptablePrefFilter : public InterceptablePrefFilter {
     ADD_FAILURE();
   }
   virtual void FilterSerializeData(
-      const base::DictionaryValue* pref_store_contents) OVERRIDE {
+      base::DictionaryValue* pref_store_contents) OVERRIDE {
     ADD_FAILURE();
   }
 
@@ -79,6 +85,9 @@ class TrackedPreferencesMigrationTest : public testing::Test {
         protected_store_migration_complete_(false) {}
 
   virtual void SetUp() OVERRIDE {
+    const std::string kSeed = "seed";
+    const std::string kDeviceId = "device-id";
+    ProfilePrefStoreManager::RegisterPrefs(local_state_.registry());
     std::set<std::string> unprotected_pref_names;
     std::set<std::string> protected_pref_names;
     unprotected_pref_names.insert(kUnprotectedPref);
@@ -90,15 +99,26 @@ class TrackedPreferencesMigrationTest : public testing::Test {
         unprotected_pref_names,
         protected_pref_names,
         base::Bind(&TrackedPreferencesMigrationTest::RemovePathFromStore,
-                   base::Unretained(this), MOCK_UNPROTECTED_PREF_STORE),
+                   base::Unretained(this),
+                   MOCK_UNPROTECTED_PREF_STORE),
         base::Bind(&TrackedPreferencesMigrationTest::RemovePathFromStore,
-                   base::Unretained(this), MOCK_PROTECTED_PREF_STORE),
+                   base::Unretained(this),
+                   MOCK_PROTECTED_PREF_STORE),
         base::Bind(
             &TrackedPreferencesMigrationTest::RegisterSuccessfulWriteClosure,
-            base::Unretained(this), MOCK_UNPROTECTED_PREF_STORE),
+            base::Unretained(this),
+            MOCK_UNPROTECTED_PREF_STORE),
         base::Bind(
             &TrackedPreferencesMigrationTest::RegisterSuccessfulWriteClosure,
-            base::Unretained(this), MOCK_PROTECTED_PREF_STORE),
+            base::Unretained(this),
+            MOCK_PROTECTED_PREF_STORE),
+        scoped_ptr<PrefHashStore>(
+            new PrefHashStoreImpl(kSeed, kDeviceId, false)),
+        scoped_ptr<PrefHashStore>(
+            new PrefHashStoreImpl(kSeed, kDeviceId, true)),
+        scoped_ptr<HashStoreContents>(
+            new PrefServiceHashStoreContents("hash-store-id", &local_state_)),
+
         &mock_unprotected_pref_filter_,
         &mock_protected_pref_filter_);
 
@@ -302,6 +322,8 @@ class TrackedPreferencesMigrationTest : public testing::Test {
 
   bool unprotected_store_migration_complete_;
   bool protected_store_migration_complete_;
+
+  TestingPrefServiceSimple local_state_;
 };
 
 }  // namespace