Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/ui/browser_instant_controller.cc

Index: chrome/browser/ui/browser_instant_controller.cc
diff --git a/chrome/browser/ui/browser_instant_controller.cc b/chrome/browser/ui/browser_instant_controller.cc
index 4118de59b0de8e390a68fa3136e01b1275fbafad..f641af4e549478326179a9fa3b4653e02e0ca226 100644
--- a/chrome/browser/ui/browser_instant_controller.cc
+++ b/chrome/browser/ui/browser_instant_controller.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/browser_instant_controller.h"
 
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service.h"
@@ -69,11 +70,14 @@ bool BrowserInstantController::IsInstantEnabled(Profile* profile) {
          profile->GetPrefs()->GetBoolean(GetInstantPrefName(profile));
 }
 
-void BrowserInstantController::RegisterUserPrefs(PrefServiceSyncable* prefs) {
-  prefs->RegisterBooleanPref(prefs::kInstantConfirmDialogShown, false,
-                             PrefServiceSyncable::SYNCABLE_PREF);
-  prefs->RegisterBooleanPref(prefs::kInstantEnabled, false,
-                             PrefServiceSyncable::SYNCABLE_PREF);
+void BrowserInstantController::RegisterUserPrefs(
+    PrefService* prefs,
+    PrefRegistrySyncable* registry) {
+  // TODO(joi): Get rid of the need for PrefService param above.
+  registry->RegisterBooleanPref(prefs::kInstantConfirmDialogShown, false,
+                                PrefRegistrySyncable::SYNCABLE_PREF);
+  registry->RegisterBooleanPref(prefs::kInstantEnabled, false,
+                                PrefRegistrySyncable::SYNCABLE_PREF);
 
   search::InstantExtendedDefault instant_extended_default_setting =
       search::GetInstantExtendedDefaultSetting();
@@ -90,9 +94,9 @@ void BrowserInstantController::RegisterUserPrefs(PrefServiceSyncable* prefs) {
       break;
   }
 
-  prefs->RegisterBooleanPref(prefs::kInstantExtendedEnabled,
-                             instant_extended_value,
-                             PrefServiceSyncable::SYNCABLE_PREF);
+  registry->RegisterBooleanPref(prefs::kInstantExtendedEnabled,
+                                instant_extended_value,
+                                PrefRegistrySyncable::SYNCABLE_PREF);
 }
 
 bool BrowserInstantController::OpenInstant(WindowOpenDisposition disposition) {