Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/sync/invalidations/invalidator_storage_unittest.cc

Index: chrome/browser/sync/invalidations/invalidator_storage_unittest.cc
diff --git a/chrome/browser/sync/invalidations/invalidator_storage_unittest.cc b/chrome/browser/sync/invalidations/invalidator_storage_unittest.cc
index b07b0e65d7247eee6cbcb756f989dfb28fd16e4c..3dbd69ec3183afd54a84105a4a35665a835bce0e 100644
--- a/chrome/browser/sync/invalidations/invalidator_storage_unittest.cc
+++ b/chrome/browser/sync/invalidations/invalidator_storage_unittest.cc
@@ -61,7 +61,7 @@ class InvalidatorStorageTest : public testing::Test {
 // Set invalidation states for various keys and verify that they are written and
 // read back correctly.
 TEST_F(InvalidatorStorageTest, SetMaxVersionAndPayload) {
-  InvalidatorStorage storage(&pref_service_);
+  InvalidatorStorage storage(&pref_service_, pref_service_.registry());
 
   InvalidationStateMap expected_states;
   EXPECT_EQ(expected_states, storage.GetAllInvalidationStates());
@@ -88,7 +88,7 @@ TEST_F(InvalidatorStorageTest, SetMaxVersionAndPayload) {
 
 // Forgetting an entry should cause that entry to be deleted.
 TEST_F(InvalidatorStorageTest, Forget) {
-  InvalidatorStorage storage(&pref_service_);
+  InvalidatorStorage storage(&pref_service_, pref_service_.registry());
   EXPECT_TRUE(storage.GetAllInvalidationStates().empty());
 
   InvalidationStateMap expected_states;
@@ -110,7 +110,7 @@ TEST_F(InvalidatorStorageTest, Forget) {
 // Clearing the storage should erase all version map entries and the bootstrap
 // data.
 TEST_F(InvalidatorStorageTest, Clear) {
-  InvalidatorStorage storage(&pref_service_);
+  InvalidatorStorage storage(&pref_service_, pref_service_.registry());
   EXPECT_TRUE(storage.GetAllInvalidationStates().empty());
   EXPECT_TRUE(storage.GetBootstrapData().empty());
 
@@ -382,7 +382,7 @@ TEST_F(InvalidatorStorageTest, MigrateLegacyPreferences) {
   legacy_dict->SetString(base::IntToString(syncer::BOOKMARKS), "32");
   legacy_dict->SetString(base::IntToString(syncer::PREFERENCES), "54");
   pref_service_.SetUserPref(prefs::kSyncMaxInvalidationVersions, legacy_dict);
-  InvalidatorStorage storage(&pref_service_);
+  InvalidatorStorage storage(&pref_service_, pref_service_.registry());
 
   // Legacy pref should be cleared.
   const base::DictionaryValue* dict =
@@ -402,7 +402,7 @@ TEST_F(InvalidatorStorageTest, MigrateLegacyPreferences) {
 }
 
 TEST_F(InvalidatorStorageTest, SetGetBootstrapData) {
-  InvalidatorStorage storage(&pref_service_);
+  InvalidatorStorage storage(&pref_service_, pref_service_.registry());
   const std::string mess("n\0tK\0\0l\344", 8);
   ASSERT_FALSE(IsStringUTF8(mess));
 
@@ -413,7 +413,7 @@ TEST_F(InvalidatorStorageTest, SetGetBootstrapData) {
 // Test that we correctly generate ack handles, acknowledge them, and persist
 // them.
 TEST_F(InvalidatorStorageTest, GenerateAckHandlesAndAcknowledge) {
-  InvalidatorStorage storage(&pref_service_);
+  InvalidatorStorage storage(&pref_service_, pref_service_.registry());
   syncer::ObjectIdSet ids;
   InvalidationStateMap state_map;
   syncer::AckHandleMap ack_handle_map;