Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/password_manager/password_store_factory.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/password_manager/password_store_factory.h"
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "chrome/browser/password_manager/login_database.h"
 #include "chrome/browser/password_manager/password_store.h"
 #include "chrome/browser/password_manager/password_store_default.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/password_manager/password_store_win.h"
@@ skipping 163 matching lines @@
     delete login_db;
 
   if (!ps || !ps->Init()) {
     NOTREACHED() << "Could not initialize password manager.";
     return NULL;
   }
 
   return ps;
 }
 
-void PasswordStoreFactory::RegisterUserPrefs(PrefServiceSyncable* prefs) {
+void PasswordStoreFactory::RegisterUserPrefs(PrefRegistrySyncable* registry) {
 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) \
   && defined(OS_POSIX)
-  prefs->RegisterIntegerPref(prefs::kLocalProfileId,
-                             kInvalidLocalProfileId,
-                             PrefServiceSyncable::UNSYNCABLE_PREF);
+  registry->RegisterIntegerPref(prefs::kLocalProfileId,
+                                kInvalidLocalProfileId,
+                                PrefRegistrySyncable::UNSYNCABLE_PREF);
 
   // Notice that the preprocessor conditions above are exactly those that will
   // result in using PasswordStoreX in CreatePasswordStore() below.
-  PasswordStoreX::RegisterUserPrefs(prefs);
+  PasswordStoreX::RegisterUserPrefs(registry);
 #endif
 }
 
 bool PasswordStoreFactory::ServiceRedirectedInIncognito() const {
   return true;
 }
 
 bool PasswordStoreFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }