Instant: Use only one hidden WebContents per profile.

chrome/browser/instant/search.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/instant/search.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
@@ skipping 170 matching lines @@
                             const content::NavigationEntry* entry) {
   if (!IsQueryExtractionEnabled())
     return string16();
 
   // For security reasons, don't extract search terms if the page is not being
   // rendered in the privileged Instant renderer process. This is to protect
   // against a malicious page somehow scripting the search results page and
   // faking search terms in the URL. Random pages can't get into the Instant
   // renderer and scripting doesn't work cross-process, so if the page is in
   // the Instant process, we know it isn't being exploited.
-  // Since iOS and Android doesn't use the instant framework, these checks are
+  // Since iOS and Android don't use the Instant framework, these checks are
   // disabled for the two platforms.
   Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
 #if !defined(OS_IOS) && !defined(OS_ANDROID)
   if (!IsRenderedInInstantProcess(contents, profile))
     return string16();
 #endif  // !defined(OS_IOS) && !defined(OS_ANDROID)
   // Check to see if search terms have already been extracted.
   string16 search_terms = GetSearchTermsFromNavigationEntry(entry);
   if (!search_terms.empty())
     return search_terms;
@@ skipping 114 matching lines @@
 }
 
 void RegisterUserPrefs(PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kInstantConfirmDialogShown, false,
                                 PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(prefs::kInstantEnabled, false,
                                 PrefRegistrySyncable::SYNCABLE_PREF);
   // This default is overridden by SetInstantExtendedPrefDefault().
   registry->RegisterBooleanPref(prefs::kInstantExtendedEnabled, false,
                                 PrefRegistrySyncable::SYNCABLE_PREF);
+
+  // TODO(jered): Remove this.
+  registry->RegisterStringPref(prefs::kInstantUIZeroSuggestUrlPrefix, "",
+                               PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 const char* GetInstantPrefName() {
   return IsInstantExtendedAPIEnabled() ? prefs::kInstantExtendedEnabled :
                                          prefs::kInstantEnabled;
 }
 
 bool IsInstantPrefEnabled(Profile* profile) {
   if (!profile || profile->IsOffTheRecord())
     return false;
@@ skipping 181 matching lines @@
   GURL::Replacements replacements;
   replacements.SetSchemeStr(search_scheme);
   replacements.SetHostStr(search_host);
   replacements.SetPortStr(search_port);
   replacements.SetPathStr(search_path);
   return instant_url.ReplaceComponents(replacements);
 }
 
 }  // namespace search
 }  // namespace chrome