Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/sync/invalidations/invalidator_storage.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Wraps PrefService in an InvalidationStateTracker to allow SyncNotifiers
 // to use PrefService as persistence for invalidation state. It is not thread
 // safe, and lives on the UI thread.
 
 #ifndef CHROME_BROWSER_SYNC_INVALIDATIONS_INVALIDATOR_STORAGE_H_
 #define CHROME_BROWSER_SYNC_INVALIDATIONS_INVALIDATOR_STORAGE_H_
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "sync/notifier/invalidation_state_tracker.h"
 
-class PrefServiceSyncable;
+class PrefService;
+class PrefRegistrySyncable;
 
 namespace base {
 class DictionaryValue;
 class ListValue;
 }
 
 namespace browser_sync {
 
 // TODO(tim): Bug 124137. We may want to move this outside of sync/ into a
 // browser/invalidations directory, or re-organize to have a browser
 // subdirectory that contains signin/ sync/ invalidations/ and other cloud
 // services.  For now this is still tied to sync while we refactor, so minimize
 // churn and keep it here.
 class InvalidatorStorage : public base::SupportsWeakPtr<InvalidatorStorage>,
                            public syncer::InvalidationStateTracker {
  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.
   void Clear();
 
   // InvalidationStateTracker implementation.
   virtual syncer::InvalidationStateMap GetAllInvalidationStates() const
       OVERRIDE;
   virtual void SetMaxVersionAndPayload(const invalidation::ObjectId& id,
                                        int64 max_version,
@@ skipping 33 matching lines @@
   // Helpers to convert between InvalidationStateMap <--> ListValue.
   static void DeserializeFromList(
       const base::ListValue& state_map_list,
       syncer::InvalidationStateMap* state_map);
   static void SerializeToList(
       const syncer::InvalidationStateMap& state_map,
       base::ListValue* state_map_list);
 
   // 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);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_INVALIDATIONS_INVALIDATOR_STORAGE_H_