Remove a variety of no-longer-used query params.

chrome/browser/search_engines/ui_thread_search_terms_data.cc

 // Copyright 2014 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/ui_thread_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"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/google/google_brand.h"
 #include "chrome/browser/google/google_url_tracker_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
-#include "chrome/browser/themes/theme_service.h"
-#include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/google/core/browser/google_url_tracker.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/omnibox/browser/omnibox_field_trial.h"
 #include "components/search/search.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/base/device_form_factor.h"
@@ skipping 89 matching lines @@
 std::string UIThreadSearchTermsData::GetSuggestRequestIdentifier() const {
   DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
       BrowserThread::CurrentlyOn(BrowserThread::UI));
 #if defined(OS_ANDROID)
   if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_PHONE)
     return "chrome-mobile-ext-ansg";
 #endif
   return "chrome-ext-ansg";
 }
 
-bool UIThreadSearchTermsData::IsShowingSearchTermsOnSearchResultsPages() const {

[samarth, 2015/12/28 20:12:21]

Unless this is directly related to the query param cleanup, I'd have a slight
preference for splitting this cleanup into a separate change to make the changes
easier to reason about.

[Peter Kasting, 2016/01/04 21:47:11]

It's directly related; the only caller of it is the code to do the query param
expansion, that I'm removing.

-  return search::IsInstantExtendedAPIEnabled() &&
-         search::IsQueryExtractionEnabled();
-}
-
 std::string UIThreadSearchTermsData::InstantExtendedEnabledParam(
     bool for_search) const {
   return search::InstantExtendedEnabledParam(for_search);
 }
 
 std::string UIThreadSearchTermsData::ForceInstantResultsParam(
     bool for_prerender) const {
   return search::ForceInstantResultsParam(for_prerender);
 }
 
-int UIThreadSearchTermsData::OmniboxStartMargin() const {
-  InstantService* instant_service =
-      InstantServiceFactory::GetForProfile(profile_);
-  // Android and iOS have no InstantService.
-  return instant_service ? instant_service->omnibox_start_margin()
-                         : search::kDisableStartMargin;
-}
-
-std::string UIThreadSearchTermsData::NTPIsThemedParam() const {
-  DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
-         BrowserThread::CurrentlyOn(BrowserThread::UI));
-#if defined(ENABLE_THEMES)
-  if (!search::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->UsingSystemTheme())
-    return "es_th=1&";
-#endif  // defined(ENABLE_THEMES)
-
-  return std::string();
-}
-
 // It's acutally OK to call this method on any thread, but it's currently placed
 // in UIThreadSearchTermsData since SearchTermsData cannot depend on src/chrome
 // as it is shared with iOS.
 std::string UIThreadSearchTermsData::GoogleImageSearchSource() const {
   std::string version(version_info::GetProductName() + " " +
                       version_info::GetVersionNumber());
   if (version_info::IsOfficialBuild())
     version += " (Official)";
   version += " " + version_info::GetOSType();
   std::string modifier(chrome::GetChannelString());
   if (!modifier.empty())
     version += " " + modifier;
   return version;
 }
 
 std::string UIThreadSearchTermsData::GetAcceptLanguages() const {
   return profile_ ? profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)
                   : 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);
 }