Record InstantExtended pref setting on startup with an UMA histogram.

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/extensions/extension_web_ui.h"
 #include "chrome/browser/prefs/pref_registry_syncable.h"
@@ skipping 21 matching lines @@
 
 using content::UserMetricsAction;
 
 namespace {
 
 const char* GetInstantPrefName(Profile* profile) {
   return chrome::search::IsInstantExtendedAPIEnabled(profile) ?
       prefs::kInstantExtendedEnabled : prefs::kInstantEnabled;
 }
 
+// Returns the PrefsService to use for checking the Instant pref for the given
+// profile, or NULL if profile does not support instant.
+PrefService* GetPrefsForInstantEnabledCheck(Profile* profile) {
+  if (profile && !profile->IsOffTheRecord())
+    return profile->GetPrefs();
+  return NULL;
+}
+
 }  // namespace
 
 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)));
   ResetInstant();
   browser_->search_model()->AddObserver(this);
 
+  if (chrome::search::IsInstantExtendedAPIEnabled(profile())) {
+    // Only record this for valid (e.g. non-incognito) profiles.
+    PrefService* prefs = GetPrefsForInstantEnabledCheck(profile());
+    if (prefs) {
+      const bool pref_value = prefs->GetBoolean(GetInstantPrefName(profile()));
+      chrome::search::RecordInstantExtendedPrefValue(pref_value);
+    }
+  }
+
 #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));
+  PrefService* prefs = GetPrefsForInstantEnabledCheck(profile);
+  return prefs && prefs->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);
@@ skipping 268 matching lines @@
     initialized_theme_info_ = true;
   }
 
   DCHECK(initialized_theme_info_);
 
   if (browser_->search_model()->mode().is_ntp())
     instant_.ThemeChanged(theme_info_);
 }
 
 }  // namespace chrome