Instant: Use only one hidden WebContents per profile.

chrome/browser/search_engines/search_terms_data.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/search_engines/search_terms_data.h"
 
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/search/search.h"
 #include "content/public/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 
 #if defined(ENABLE_RLZ)
 #include "chrome/browser/rlz/rlz.h"
 #endif
 
 using content::BrowserThread;
 
@@ skipping 98 matching lines @@
 std::string UIThreadSearchTermsData::GetSearchClient() const {
   DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
       BrowserThread::CurrentlyOn(BrowserThread::UI));
   return std::string();
 }
 #endif
 
 std::string UIThreadSearchTermsData::InstantEnabledParam() const {
   DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (profile_) {
-    uint32 instant_extended_api_version =
-        chrome::search::EmbeddedSearchPageVersion(profile_);
-    if (instant_extended_api_version == 0 &&
-        chrome::BrowserInstantController::IsInstantEnabled(profile_))
-      return "ion=1&";
-  }
+  if (chrome::search::IsInstantPrefEnabled(profile_) &&
+      !chrome::search::IsInstantExtendedAPIEnabled(profile_))
+    return "ion=1&";
   return std::string();
 }
 
 std::string UIThreadSearchTermsData::InstantExtendedEnabledParam() const {
   DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (profile_) {
-    uint32 instant_extended_api_version =
-        chrome::search::EmbeddedSearchPageVersion(profile_);
-    if (instant_extended_api_version != 0) {
-      return std::string(google_util::kInstantExtendedAPIParam) + "=" +
-          base::Uint64ToString(instant_extended_api_version) + "&";
-    }
+  uint64 instant_extended_api_version =
+      chrome::search::EmbeddedSearchPageVersion(profile_);
+  if (instant_extended_api_version) {
+    return std::string(google_util::kInstantExtendedAPIParam) + "=" +
+        base::Uint64ToString(instant_extended_api_version) + "&";
   }
   return std::string();
 }
 
 // static
 void UIThreadSearchTermsData::SetGoogleBaseURL(const std::string& base_url) {
   delete google_base_url_;
   google_base_url_ = base_url.empty() ? NULL : new std::string(base_url);
 }