Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/sync/invalidations/invalidator_storage.cc

 // 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.
 
 #include "chrome/browser/sync/invalidations/invalidator_storage.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "base/task_runner.h"
 #include "base/values.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/pref_names.h"
 #include "sync/internal_api/public/base/model_type.h"
 
 using syncer::InvalidationStateMap;
 
 namespace browser_sync {
 
 namespace {
 
@@ skipping 60 matching lines @@
   value->SetString(kPayloadKey, state.payload);
   if (state.current.IsValid())
     value->Set(kCurrentAckHandleKey, state.current.ToValue().release());
   if (state.expected.IsValid())
     value->Set(kExpectedAckHandleKey, state.expected.ToValue().release());
   return value;
 }
 
 }  // namespace
 
-InvalidatorStorage::InvalidatorStorage(PrefServiceSyncable* pref_service)
+InvalidatorStorage::InvalidatorStorage(PrefService* pref_service,
+                                       PrefRegistrySyncable* registry)
     : pref_service_(pref_service) {
   // TODO(tim): Create a Mock instead of maintaining the if(!pref_service_) case
   // throughout this file.  This is a problem now due to lack of injection at
   // ProfileSyncService. Bug 130176.
-  if (pref_service_) {
-    pref_service_->RegisterListPref(prefs::kInvalidatorMaxInvalidationVersions,
-                                    PrefServiceSyncable::UNSYNCABLE_PREF);
-    pref_service_->RegisterStringPref(prefs::kInvalidatorInvalidationState,
-                                      std::string(),
-                                      PrefServiceSyncable::UNSYNCABLE_PREF);
+  if (registry) {

[Mattias Nissler (ping if slow), 2013/02/06 17:53:33]

TODO: Move to registration function.

[Jói, 2013/02/07 14:52:32]

Done.

+    registry->RegisterListPref(prefs::kInvalidatorMaxInvalidationVersions,
+                               PrefRegistrySyncable::UNSYNCABLE_PREF);
+    registry->RegisterStringPref(prefs::kInvalidatorInvalidationState,
+                                 std::string(),
+                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
 
-    MigrateMaxInvalidationVersionsPref();
+    MigrateMaxInvalidationVersionsPref(registry);
   }
 }
 
 InvalidatorStorage::~InvalidatorStorage() {
 }
 
 InvalidationStateMap InvalidatorStorage::GetAllInvalidationStates() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   InvalidationStateMap state_map;
   if (!pref_service_) {
@@ skipping 67 matching lines @@
 void InvalidatorStorage::SerializeToList(
     const InvalidationStateMap& state_map,
     base::ListValue* state_map_list) {
   for (InvalidationStateMap::const_iterator it = state_map.begin();
        it != state_map.end(); ++it) {
     state_map_list->Append(ObjectIdAndStateToValue(it->first, it->second));
   }
 }
 
 // Legacy migration code.
-void InvalidatorStorage::MigrateMaxInvalidationVersionsPref() {
-  pref_service_->RegisterDictionaryPref(prefs::kSyncMaxInvalidationVersions,
-                                        PrefServiceSyncable::UNSYNCABLE_PREF);
+void InvalidatorStorage::MigrateMaxInvalidationVersionsPref(
+    PrefRegistrySyncable* registry) {
+  registry->RegisterDictionaryPref(prefs::kSyncMaxInvalidationVersions,
+                                   PrefRegistrySyncable::UNSYNCABLE_PREF);
   const base::DictionaryValue* max_versions_dict =
       pref_service_->GetDictionary(prefs::kSyncMaxInvalidationVersions);
   CHECK(max_versions_dict);
   if (!max_versions_dict->empty()) {
     InvalidationStateMap state_map;
     DeserializeMap(max_versions_dict, &state_map);
     base::ListValue state_map_list;
     SerializeToList(state_map, &state_map_list);
     pref_service_->Set(prefs::kInvalidatorMaxInvalidationVersions,
                        state_map_list);
@@ skipping 106 matching lines @@
     return;
   it->second.current = ack_handle;
 
   base::ListValue state_map_list;
   SerializeToList(state_map, &state_map_list);
   pref_service_->Set(prefs::kInvalidatorMaxInvalidationVersions,
                      state_map_list);
 }
 
 }  // namespace browser_sync