Second batch of fixing prefs registrations.

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"
@@ skipping 76 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(PrefService* pref_service,
-                                       PrefRegistrySyncable* registry)
+// static
+void InvalidatorStorage::RegisterUserPrefs(PrefRegistrySyncable* registry) {
+  registry->RegisterListPref(prefs::kInvalidatorMaxInvalidationVersions,
+                             PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterStringPref(prefs::kInvalidatorInvalidationState,
+                               std::string(),
+                               PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterStringPref(prefs::kInvalidatorClientId,
+                                 std::string(),
+                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterDictionaryPref(prefs::kSyncMaxInvalidationVersions,
+                                   PrefRegistrySyncable::UNSYNCABLE_PREF);
+}
+
+InvalidatorStorage::InvalidatorStorage(PrefService* pref_service)
     : 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 (registry) {
-    // TODO(joi): Move to registration function.
-    registry->RegisterListPref(prefs::kInvalidatorMaxInvalidationVersions,
-                               PrefRegistrySyncable::UNSYNCABLE_PREF);
-    registry->RegisterStringPref(prefs::kInvalidatorInvalidationState,
-                                 std::string(),
-                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
-    registry->RegisterStringPref(prefs::kInvalidatorClientId,
-                                 std::string(),
-                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
-
-    MigrateMaxInvalidationVersionsPref(registry);
-  }
+  if (pref_service_)
+    MigrateMaxInvalidationVersionsPref();
 }
 
 InvalidatorStorage::~InvalidatorStorage() {
 }
 
 InvalidationStateMap InvalidatorStorage::GetAllInvalidationStates() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   InvalidationStateMap state_map;
   if (!pref_service_) {
     return state_map;
@@ skipping 66 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(
-    PrefRegistrySyncable* registry) {
-  registry->RegisterDictionaryPref(prefs::kSyncMaxInvalidationVersions,
-                                   PrefRegistrySyncable::UNSYNCABLE_PREF);
+void InvalidatorStorage::MigrateMaxInvalidationVersionsPref() {
   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 118 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