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

components/omnibox/browser/history_url_provider.cc

Index: components/omnibox/browser/history_url_provider.cc
diff --git a/components/omnibox/browser/history_url_provider.cc b/components/omnibox/browser/history_url_provider.cc
index 978cb86527ac793a7d3e5a8df9798c473a26aa1c..a7a4b0147639dc63b63ed20e47d876175bed7f10 100644
--- a/components/omnibox/browser/history_url_provider.cc
+++ b/components/omnibox/browser/history_url_provider.cc
@@ -277,10 +277,8 @@ class SearchTermsDataSnapshot : public SearchTermsData {
   std::string GetApplicationLocale() const override;
   base::string16 GetRlzParameterValue(bool from_app_list) const override;
   std::string GetSearchClient() const override;
-  bool IsShowingSearchTermsOnSearchResultsPages() const override;
   std::string InstantExtendedEnabledParam(bool for_search) const override;
   std::string ForceInstantResultsParam(bool for_prerender) const override;
-  std::string NTPIsThemedParam() const override;
   std::string GoogleImageSearchSource() const override;
 
  private:
@@ -288,12 +286,10 @@ class SearchTermsDataSnapshot : public SearchTermsData {
   std::string application_locale_;
   base::string16 rlz_parameter_value_;
   std::string search_client_;
-  bool is_showing_search_terms_on_search_results_pages_;
   std::string instant_extended_enabled_param_;
   std::string instant_extended_enabled_param_for_search_;
   std::string force_instant_results_param_;
   std::string force_instant_results_param_for_prerender_;
-  std::string ntp_is_themed_param_;
   std::string google_image_search_source_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchTermsDataSnapshot);
@@ -305,8 +301,6 @@ SearchTermsDataSnapshot::SearchTermsDataSnapshot(
       application_locale_(search_terms_data.GetApplicationLocale()),
       rlz_parameter_value_(search_terms_data.GetRlzParameterValue(false)),
       search_client_(search_terms_data.GetSearchClient()),
-      is_showing_search_terms_on_search_results_pages_(
-          search_terms_data.IsShowingSearchTermsOnSearchResultsPages()),
       instant_extended_enabled_param_(
           search_terms_data.InstantExtendedEnabledParam(false)),
       instant_extended_enabled_param_for_search_(
@@ -315,7 +309,6 @@ SearchTermsDataSnapshot::SearchTermsDataSnapshot(
           search_terms_data.ForceInstantResultsParam(false)),
       force_instant_results_param_for_prerender_(
           search_terms_data.ForceInstantResultsParam(true)),
-      ntp_is_themed_param_(search_terms_data.NTPIsThemedParam()),
       google_image_search_source_(search_terms_data.GoogleImageSearchSource()) {
 }
 
@@ -339,10 +332,6 @@ std::string SearchTermsDataSnapshot::GetSearchClient() const {
   return search_client_;
 }
 
-bool SearchTermsDataSnapshot::IsShowingSearchTermsOnSearchResultsPages() const {
-  return is_showing_search_terms_on_search_results_pages_;
-}
-
 std::string SearchTermsDataSnapshot::InstantExtendedEnabledParam(
     bool for_search) const {
   return for_search ? instant_extended_enabled_param_ :
@@ -355,10 +344,6 @@ std::string SearchTermsDataSnapshot::ForceInstantResultsParam(
       force_instant_results_param_for_prerender_;
 }
 
-std::string SearchTermsDataSnapshot::NTPIsThemedParam() const {
-  return ntp_is_themed_param_;
-}
-
 std::string SearchTermsDataSnapshot::GoogleImageSearchSource() const {
   return google_image_search_source_;
 }