Cleanup: Remove for_search param from search::InstantExtendedEnabledParam()

components/omnibox/browser/history_url_provider.cc

 // Copyright (c) 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 "components/omnibox/browser/history_url_provider.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 261 matching lines @@
 // UIThreadSearchTermsData but is subsequently safe to use on any thread.
 class SearchTermsDataSnapshot : public SearchTermsData {
  public:
   explicit SearchTermsDataSnapshot(const SearchTermsData& search_terms_data);
   ~SearchTermsDataSnapshot() override;
 
   std::string GoogleBaseURLValue() const override;
   std::string GetApplicationLocale() const override;
   base::string16 GetRlzParameterValue(bool from_app_list) const override;
   std::string GetSearchClient() const override;
-  std::string InstantExtendedEnabledParam(bool for_search) const override;
+  std::string InstantExtendedEnabledParam() const override;
   std::string ForceInstantResultsParam(bool for_prerender) const override;
   std::string GoogleImageSearchSource() const override;
 
  private:
   std::string google_base_url_value_;
   std::string application_locale_;
   base::string16 rlz_parameter_value_;
   std::string search_client_;
   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 google_image_search_source_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchTermsDataSnapshot);
 };
 
 SearchTermsDataSnapshot::SearchTermsDataSnapshot(
     const SearchTermsData& search_terms_data)
     : google_base_url_value_(search_terms_data.GoogleBaseURLValue()),
       application_locale_(search_terms_data.GetApplicationLocale()),
       rlz_parameter_value_(search_terms_data.GetRlzParameterValue(false)),
       search_client_(search_terms_data.GetSearchClient()),
       instant_extended_enabled_param_(
-          search_terms_data.InstantExtendedEnabledParam(false)),
-      instant_extended_enabled_param_for_search_(
-          search_terms_data.InstantExtendedEnabledParam(true)),
+          search_terms_data.InstantExtendedEnabledParam()),
       force_instant_results_param_(
           search_terms_data.ForceInstantResultsParam(false)),
       force_instant_results_param_for_prerender_(
           search_terms_data.ForceInstantResultsParam(true)),
       google_image_search_source_(search_terms_data.GoogleImageSearchSource()) {
 }
 
 SearchTermsDataSnapshot::~SearchTermsDataSnapshot() {
 }
 
 std::string SearchTermsDataSnapshot::GoogleBaseURLValue() const {
   return google_base_url_value_;
 }
 
 std::string SearchTermsDataSnapshot::GetApplicationLocale() const {
   return application_locale_;
 }
 
 base::string16 SearchTermsDataSnapshot::GetRlzParameterValue(
     bool from_app_list) const {
   return rlz_parameter_value_;
 }
 
 std::string SearchTermsDataSnapshot::GetSearchClient() const {
   return search_client_;
 }
 
-std::string SearchTermsDataSnapshot::InstantExtendedEnabledParam(
-    bool for_search) const {
-  return for_search ? instant_extended_enabled_param_ :
-      instant_extended_enabled_param_for_search_;
+std::string SearchTermsDataSnapshot::InstantExtendedEnabledParam() const {
+  return instant_extended_enabled_param_;
 }
 
 std::string SearchTermsDataSnapshot::ForceInstantResultsParam(
     bool for_prerender) const {
   return for_prerender ? force_instant_results_param_ :
       force_instant_results_param_for_prerender_;
 }
 
 std::string SearchTermsDataSnapshot::GoogleImageSearchSource() const {
   return google_image_search_source_;
@@ skipping 841 matching lines @@
     AutocompleteMatch::ClassifyLocationInString(base::string16::npos, 0,
         match.contents.length(), ACMatchClassification::URL,
         &match.contents_class);
   }
   match.description = info.title();
   match.description_class =
       ClassifyDescription(params.input.text(), match.description);
   RecordAdditionalInfoFromUrlRow(info, &match);
   return match;
 }