Fix prefs registration for BrowserInstantController.

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 "base/prefs/pref_service.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/pref_registry_syncable.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/theme_resources.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/sys_color_change_listener.h"
 
-namespace {
-const char* GetInstantPrefName(Profile* profile) {
-  return chrome::search::IsInstantExtendedAPIEnabled(profile) ?
-      prefs::kInstantExtendedEnabled : prefs::kInstantEnabled;
-}
-}
-
 namespace chrome {
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserInstantController, public:
 
 BrowserInstantController::BrowserInstantController(Browser* browser)
     : browser_(browser),
       instant_(ALLOW_THIS_IN_INITIALIZER_LIST(this),
                chrome::search::IsInstantExtendedAPIEnabled(profile())),
       instant_unload_handler_(browser),
       initialized_theme_info_(false) {
-  profile_pref_registrar_.Init(profile()->GetPrefs());
-  profile_pref_registrar_.Add(
-      GetInstantPrefName(profile()),
-      base::Bind(&BrowserInstantController::ResetInstant,
-                 base::Unretained(this)));
-  profile_pref_registrar_.Add(
-      prefs::kSearchSuggestEnabled,
-      base::Bind(&BrowserInstantController::ResetInstant,
-                 base::Unretained(this)));
+  PrefService* prefs = profile()->GetPrefs();
+
+  profile_pref_registrar_.Init(prefs);
+  base::Closure reset_instant = base::Bind(
+      &BrowserInstantController::ResetInstant,
+      base::Unretained(this));
+  profile_pref_registrar_.Add(prefs::kInstantEnabled, reset_instant);
+  profile_pref_registrar_.Add(prefs::kInstantExtendedEnabled, reset_instant);
+  profile_pref_registrar_.Add(prefs::kSearchSuggestEnabled, reset_instant);
   ResetInstant();
   browser_->search_model()->AddObserver(this);
 
 #if defined(ENABLE_THEMES)
   // Listen for theme installation.
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  content::Source<ThemeService>(
                      ThemeServiceFactory::GetForProfile(profile())));
 #endif  // defined(ENABLE_THEMES)
 }
 
 BrowserInstantController::~BrowserInstantController() {
   browser_->search_model()->RemoveObserver(this);
 }
 
 bool BrowserInstantController::IsInstantEnabled(Profile* profile) {
-  return profile && !profile->IsOffTheRecord() && profile->GetPrefs() &&
-         profile->GetPrefs()->GetBoolean(GetInstantPrefName(profile));
+  if (!profile || profile->IsOffTheRecord())
+    return false;
+
+  PrefService* prefs = profile->GetPrefs();
+  if (!prefs)
+    return false;
+
+  if (!chrome::search::IsInstantExtendedAPIEnabled(profile) ||
+      (search::GetInstantExtendedDefaultSetting() ==
+       search::INSTANT_USE_EXISTING &&
+       prefs->FindPreference(
+           prefs::kInstantExtendedEnabled)->IsDefaultValue())) {
+    return prefs->GetBoolean(prefs::kInstantEnabled);
+  } else {
+    return prefs->GetBoolean(prefs::kInstantExtendedEnabled);
+  }
 }
 
 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);
 
   bool instant_extended_default = true;
   switch (search::GetInstantExtendedDefaultSetting()) {
     case search::INSTANT_DEFAULT_ON:
       instant_extended_default = true;
       break;
+    // In the INSTANT_USE_EXISTING case, the kInstantExtendedEnabled
+    // preference, if it still has a default value, is set to the
+    // value of kInstantEnabled in the constructor of this class.
     case search::INSTANT_USE_EXISTING:
-      instant_extended_default = prefs->GetBoolean(prefs::kInstantEnabled);
-      break;
     case search::INSTANT_DEFAULT_OFF:
       instant_extended_default = false;
       break;
   }
 
   registry->RegisterBooleanPref(prefs::kInstantExtendedEnabled,
                                 instant_extended_default,
                                 PrefRegistrySyncable::SYNCABLE_PREF);
 }
 
@@ skipping 235 matching lines @@
     initialized_theme_info_ = true;
   }
 
   DCHECK(initialized_theme_info_);
 
   if (browser_->search_model()->mode().is_ntp())
     instant_.ThemeChanged(theme_info_);
 }
 
 }  // namespace chrome