Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/ui/browser_instant_controller.cc

 // 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.
 
 #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"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/search/search.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
@@ skipping 48 matching lines @@
 
 BrowserInstantController::~BrowserInstantController() {
   browser_->search_model()->RemoveObserver(this);
 }
 
 bool BrowserInstantController::IsInstantEnabled(Profile* profile) {
   return profile && !profile->IsOffTheRecord() && profile->GetPrefs() &&
          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();
 
   bool instant_extended_value = true;
   switch (instant_extended_default_setting) {
     case search::INSTANT_FORCE_ON:
       break;
     case search::INSTANT_USE_EXISTING:
       instant_extended_value = prefs->GetBoolean(prefs::kInstantEnabled);
       break;
     case search::INSTANT_FORCE_OFF:
       instant_extended_value = false;
       break;
   }
 
-  prefs->RegisterBooleanPref(prefs::kInstantExtendedEnabled,
-                             instant_extended_value,
-                             PrefServiceSyncable::SYNCABLE_PREF);
+  registry->RegisterBooleanPref(prefs::kInstantExtendedEnabled,
+                                instant_extended_value,
+                                PrefRegistrySyncable::SYNCABLE_PREF);
 }
 
 bool BrowserInstantController::MaybeSwapInInstantNTPContents(
     const GURL& url,
     content::WebContents* source_contents,
     content::WebContents** target_contents) {
   if (url != GURL(chrome::kChromeUINewTabURL))
     return false;
 
   scoped_ptr<content::WebContents> instant_ntp = instant_.ReleaseNTPContents();
@@ skipping 250 matching lines @@
   // part of the image overlay should draw, 'cos the origin is top-left.
   if (!browser_->search_model()->mode().is_ntp() ||
       theme_info_.theme_id.empty() ||
       theme_info_.image_vertical_alignment == THEME_BKGRND_IMAGE_ALIGN_TOP) {
     return;
   }
   instant_.ThemeAreaHeightChanged(theme_area_height_);
 }
 
 }  // namespace chrome