Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/sync/invalidations/invalidator_storage.h

Index: chrome/browser/sync/invalidations/invalidator_storage.h
diff --git a/chrome/browser/sync/invalidations/invalidator_storage.h b/chrome/browser/sync/invalidations/invalidator_storage.h
index 12e67ae89f9f9ca3094c20ae38f8f1f817474678..d5e5df3945aa16e6ee65ea8709d1be675456e80d 100644
--- a/chrome/browser/sync/invalidations/invalidator_storage.h
+++ b/chrome/browser/sync/invalidations/invalidator_storage.h
@@ -15,7 +15,8 @@
 #include "base/threading/thread_checker.h"
 #include "sync/notifier/invalidation_state_tracker.h"
 
-class PrefServiceSyncable;
+class PrefService;
+class PrefRegistrySyncable;
 
 namespace base {
 class DictionaryValue;
@@ -34,7 +35,8 @@ class InvalidatorStorage : public base::SupportsWeakPtr<InvalidatorStorage>,
  public:
   // |pref_service| may be NULL (for unit tests), but in that case no setter
   // methods should be called. Does not own |pref_service|.
-  explicit InvalidatorStorage(PrefServiceSyncable* pref_service);
+  explicit InvalidatorStorage(PrefService* pref_service,
+                              PrefRegistrySyncable* registry);
   virtual ~InvalidatorStorage();
 
   // Erases invalidation versions and state stored on disk.
@@ -88,12 +90,12 @@ class InvalidatorStorage : public base::SupportsWeakPtr<InvalidatorStorage>,
 
   // Code for migrating from old MaxInvalidationVersions pref, which was a map
   // from sync types to max invalidation versions.
-  void MigrateMaxInvalidationVersionsPref();
+  void MigrateMaxInvalidationVersionsPref(PrefRegistrySyncable* registry);
   static void DeserializeMap(const base::DictionaryValue* max_versions_dict,
                              syncer::InvalidationStateMap* map);
 
   // May be NULL.
-  PrefServiceSyncable* const pref_service_;
+  PrefService* const pref_service_;
 
   DISALLOW_COPY_AND_ASSIGN(InvalidatorStorage);
 };