Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/content_settings/cookie_settings.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_CONTENT_SETTINGS_COOKIE_SETTINGS_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_COOKIE_SETTINGS_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
 #include "base/prefs/public/pref_change_registrar.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/profiles/refcounted_profile_keyed_service.h"
 #include "chrome/browser/profiles/refcounted_profile_keyed_service_factory.h"
 #include "chrome/common/content_settings.h"
 
 class ContentSettingsPattern;
 class CookieSettingsWrapper;
 class GURL;
 class PrefService;
-class PrefServiceSyncable;
+class PrefRegistrySyncable;
 class Profile;
 
 // A frontend to the cookie settings of |HostContentSettingsMap|. Handles
 // cookie-specific logic such as blocking third-party cookies. Written on the UI
 // thread and read on any thread. One instance per profile.
 
 class CookieSettings
     : public RefcountedProfileKeyedService {
  public:
   CookieSettings(
@@ skipping 60 matching lines @@
   // |Profile|. Afterwards, only const methods can be called.
   virtual void ShutdownOnUIThread() OVERRIDE;
 
   // A helper for applying third party cookie blocking rules.
   ContentSetting GetCookieSetting(
       const GURL& url,
       const GURL& first_party_url,
       bool setting_cookie,
       content_settings::SettingSource* source) const;
 
-  static void RegisterUserPrefs(PrefServiceSyncable* prefs);
+  static void RegisterUserPrefs(PrefRegistrySyncable* registry);
 
   class Factory : public RefcountedProfileKeyedServiceFactory {
    public:
     // Returns the |CookieSettings| associated with the |profile|.
     //
     // This should only be called on the UI thread.
     static scoped_refptr<CookieSettings> GetForProfile(Profile* profile);
 
     static Factory* GetInstance();
 
    private:
     friend struct DefaultSingletonTraits<Factory>;
 
     Factory();
     virtual ~Factory();
 
     // |ProfileKeyedBaseFactory| methods:
-    virtual void RegisterUserPrefs(PrefServiceSyncable* user_prefs) OVERRIDE;
+    virtual void RegisterUserPrefs(PrefRegistrySyncable* registry) OVERRIDE;
     virtual bool ServiceRedirectedInIncognito() const OVERRIDE;
     virtual scoped_refptr<RefcountedProfileKeyedService>
         BuildServiceInstanceFor(Profile* profile) const OVERRIDE;
   };
 
  private:
   virtual ~CookieSettings();
 
   void OnBlockThirdPartyCookiesChanged();
 
   // Returns true if the "block third party cookies" preference is set.
   //
   // This method may be called on any thread.
   bool ShouldBlockThirdPartyCookies() const;
 
   scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
   PrefChangeRegistrar pref_change_registrar_;
 
   // Used around accesses to |block_third_party_cookies_| to guarantee thread
   // safety.
   mutable base::Lock lock_;
 
   bool block_third_party_cookies_;
 };
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_COOKIE_SETTINGS_H_