Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/profiles/profile_keyed_base_factory.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.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_KEYED_BASE_FACTORY_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_KEYED_BASE_FACTORY_H_
 
 #include <set>
 
 #include "base/threading/non_thread_safe.h"
 
-class PrefServiceSyncable;
+class PrefRegistrySyncable;
+class PrefService;
 class Profile;
 class ProfileDependencyManager;
 
 // Base class for Factories that take a Profile object and return some service.
 //
 // Unless you're trying to make a new type of Factory, you probably don't want
 // this class, but its subclasses: ProfileKeyedServiceFactory and
 // RefcountedProfileKeyedServiceFactory. This object describes general
 // dependency management between Factories; subclasses react to lifecycle
 // events and implement memory management.
@@ skipping 20 matching lines @@
   void DependsOn(ProfileKeyedBaseFactory* rhs);
 
   // Finds which profile (if any) to use using the Service.*Incognito methods.
   Profile* GetProfileToUse(Profile* profile);
 
   // Interface for people building a concrete FooServiceFactory: --------------
 
   // Register any user preferences on this service. This is called during
   // CreateProfileService() since preferences are registered on a per Profile
   // basis.
-  virtual void RegisterUserPrefs(PrefServiceSyncable* user_prefs) {}
+  //
+  // TODO(joi): Remove need for the version with the PrefService parameter.
+  virtual void RegisterUserPrefs(PrefRegistrySyncable* registry) {}
+  virtual void DeprecatedRegisterUserPrefs(PrefService* prefs,
+                                           PrefRegistrySyncable* registry) {}
 
   // By default, if we are asked for a service with an Incognito profile, we
   // pass back NULL. To redirect to the Incognito's original profile or to
   // create another instance, even for Incognito windows, override one of the
   // following methods:
   virtual bool ServiceRedirectedInIncognito() const;
   virtual bool ServiceHasOwnInstanceInIncognito() const;
 
   // By default, we create instances of a service lazily and wait until
   // GetForProfile() is called on our subclass. Some services need to be
@@ skipping 58 matching lines @@
 
 #if !defined(NDEBUG)
   // A static string passed in to our constructor. Should be unique across all
   // services. This is used only for debugging in debug mode. (We can print
   // pretty graphs with GraphViz with this information.)
   const char* service_name_;
 #endif
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_KEYED_BASE_FACTORY_H_