Move SearchTermsData::ForceInstantResultsParam() to chrome::ForceInstantResultsParam().

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/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
@@ skipping 60 matching lines @@
 }
 
 std::string SearchTermsData::GetSuggestClient() const {
   return std::string();
 }
 
 std::string SearchTermsData::GetSuggestRequestIdentifier() const {
   return std::string();
 }
 
-std::string SearchTermsData::ForceInstantResultsParam(
-    bool for_prerender) const {
-  return std::string();
-}
-
 std::string SearchTermsData::NTPIsThemedParam() const {
   return std::string();
 }
 
 // static
 std::string* UIThreadSearchTermsData::google_base_url_ = NULL;
 
 UIThreadSearchTermsData::UIThreadSearchTermsData(Profile* profile)
     : profile_(profile) {
   DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
@@ skipping 69 matching lines @@
 #if defined(OS_ANDROID)
   sync_pb::SyncEnums::DeviceType device_type =
       browser_sync::DeviceInfo::GetLocalDeviceType();
   return device_type == sync_pb::SyncEnums_DeviceType_TYPE_PHONE ?
     "chrome-mobile-ext" : "chrome-ext";
 #else
   return "chrome-ext";
 #endif
 }
 
-std::string UIThreadSearchTermsData::ForceInstantResultsParam(
-    bool for_prerender) const {
-  DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
-         BrowserThread::CurrentlyOn(BrowserThread::UI));
-  return (for_prerender || !chrome::IsInstantExtendedAPIEnabled()) ? "ion=1&" :
-      std::string();
-}
-
 std::string UIThreadSearchTermsData::NTPIsThemedParam() const {
   DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::UI));
 #if defined(ENABLE_THEMES)
   if (!chrome::IsInstantExtendedAPIEnabled())
     return std::string();
 
   // TODO(dhollowa): Determine fraction of custom themes that don't affect the
   // NTP background and/or color.
   ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile_);
   // NTP is considered themed if the theme is not default and not native (GTK+).
   if (theme_service && !theme_service->UsingDefaultTheme() &&
       !theme_service->UsingNativeTheme())
     return "es_th=1&";
 #endif  // defined(ENABLE_THEMES)
 
   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);
 }