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 28 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // 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());
+  PrefService* prefs = profile()->GetPrefs();
+
+  // If kInstantExtendedEnabled still has a default value, and the
+  // intent is for it to have the same starting value as whatever
+  // kInstantEnabled has, then we set it to the value of
+  // kInstantEnabled.
+  if (search::GetInstantExtendedDefaultSetting() ==
+      search::INSTANT_USE_EXISTING &&
+      prefs->FindPref(prefs::kInstantExtendedEnabled)->IsDefaultValue()) {
+    prefs->SetBoolean(prefs::kInstantExtendedEnabled,
+                      prefs->GetBoolean(prefs::kInstantEnabled));

[Mattias Nissler (ping if slow), 2013/02/22 17:07:56]

After all the discussion, I don't think copying the value is a good idea, given
that he existing value may come from policy or whatever and coping that doesn't
reflect what we want.

Can we:

(1) not copy pref values

(2) Change IsInstantEnabled below to look at both prefs and use the appropriate
one as determined by 

(search::GetInstantExtendedDefaultSetting() == search::INSTANT_USE_EXISTING &&
prefs->FindPref(prefs::kInstantExtendedEnabled)->IsDefaultValue())

(3) wire the pref registrar to both pref names so we're sure to pick up changes
no matter which pref changes?

+  }
+
+  profile_pref_registrar_.Init(prefs);
   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)));
   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));
 }
 
 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