Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/ui/browser_instant_controller.h

 // Copyright 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_UI_BROWSER_INSTANT_CONTROLLER_H_
 #define CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/prefs/public/pref_change_registrar.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/instant/instant_unload_handler.h"
 #include "chrome/browser/ui/search/search_model_observer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/base/window_open_disposition.h"
 
 class Browser;
 struct InstantSuggestion;
-class PrefServiceSyncable;
+class PrefRegistrySyncable;
+class PrefService;
 class Profile;
 class ThemeService;
 
 namespace content {
 class WebContents;
 }
 
 namespace gfx {
 class Rect;
 }
 
 namespace chrome {
 
 class BrowserInstantController : public content::NotificationObserver,
                                  public search::SearchModelObserver {
  public:
   explicit BrowserInstantController(Browser* browser);
   virtual ~BrowserInstantController();
 
   // Returns true if Instant is enabled in a visible, preview-showing mode.
   static bool IsInstantEnabled(Profile* profile);
 
   // Registers Instant related preferences.
-  static void RegisterUserPrefs(PrefServiceSyncable* prefs);
+  static void RegisterUserPrefs(PrefService* prefs,
+                                PrefRegistrySyncable* registry);
 
   // If |url| is the new tab page URL, set |target_contents| to the preloaded
   // NTP contents from InstantController. If |source_contents| is not NULL, we
   // replace it with the new |target_contents| in the tabstrip and delete
   // |source_contents|. Otherwise, the caller owns |target_contents| and is
   // responsible for inserting it into the tabstrip.
   //
   // Returns true if and only if we update |target_contents|.
   bool MaybeSwapInInstantNTPContents(
       const GURL& url,
@@ skipping 91 matching lines @@
   PrefChangeRegistrar profile_pref_registrar_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserInstantController);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_