Instant: Use only one hidden WebContents per profile.

chrome/browser/ui/webui/options/browser_options_handler.cc

Index: chrome/browser/ui/webui/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 2775f3c8c1b7a988ef5b05e00d715ece1f575498..b9cca591c3c4665446a3ede6252cc74e0c67aa39 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -407,15 +407,12 @@ void BrowserOptionsHandler::GetLocalizedValues(DictionaryValue* values) {
       "defaultSearchGroupLabel",
       l10n_util::GetStringFUTF16(IDS_SEARCH_PREF_EXPLANATION, omnibox_url));
 
+  std::string instant_pref_name =
+      chrome::search::GetInstantPrefName(Profile::FromWebUI(web_ui()));
+  int instant_message_id = instant_pref_name == prefs::kInstantEnabled ?
+      IDS_INSTANT_PREF_WITH_WARNING : IDS_INSTANT_EXTENDED_PREF_WITH_WARNING;
   string16 instant_learn_more_url = ASCIIToUTF16(chrome::kInstantLearnMoreURL);
-  int instant_message_id = IDS_INSTANT_PREF_WITH_WARNING;
-  if (chrome::search::IsInstantExtendedAPIEnabled(
-      Profile::FromWebUI(web_ui()))) {
-    instant_message_id = IDS_INSTANT_EXTENDED_PREF_WITH_WARNING;
-    values->SetString("instant_enabled", "instant_extended.enabled");
-  } else {
-    values->SetString("instant_enabled", "instant.enabled");
-  }
+  values->SetString("instant_enabled", instant_pref_name);
   values->SetString(
       "instantPrefAndWarning",
       l10n_util::GetStringFUTF16(instant_message_id, instant_learn_more_url));
@@ -991,7 +988,6 @@ scoped_ptr<ListValue> BrowserOptionsHandler::GetProfilesInfoList() {
                               profile_path == current_profile_path);
     profile_value->SetBoolean("isManaged", cache.ProfileIsManagedAtIndex(i));
 
-
     bool is_gaia_picture =
         cache.IsUsingGAIAPictureOfProfileAtIndex(i) &&
         cache.GetGAIAPictureOfProfileAtIndex(i);