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

components/search_engines/template_url.cc

Index: components/search_engines/template_url.cc
diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc
index 4bc489192d659d74fd163bb0b58f59ec12b61346..96dbc14ac98383942d8b95bebad8d4e33ec22ad5 100644
--- a/components/search_engines/template_url.cc
+++ b/components/search_engines/template_url.cc
@@ -147,9 +147,7 @@ TemplateURLRef::SearchTermsArgs::SearchTermsArgs(
       input_type(metrics::OmniboxInputType::INVALID),
       accepted_suggestion(NO_SUGGESTIONS_AVAILABLE),
       cursor_position(base::string16::npos),
-      enable_omnibox_start_margin(false),
       page_classification(metrics::OmniboxEventProto::INVALID_SPEC),
-      bookmark_bar_pinned(false),
       append_extra_query_params(false),
       force_instant_results(false),
       from_app_list(false),
@@ -570,8 +568,6 @@ bool TemplateURLRef::ParseParameter(size_t start,
     replacements->push_back(Replacement(GOOGLE_BASE_URL, start));
   } else if (parameter == "google:baseSuggestURL") {
     replacements->push_back(Replacement(GOOGLE_BASE_SUGGEST_URL, start));
-  } else if (parameter == "google:bookmarkBarPinned") {
-    replacements->push_back(Replacement(GOOGLE_BOOKMARK_BAR_PINNED, start));
   } else if (parameter == "google:currentPageUrl") {
     replacements->push_back(Replacement(GOOGLE_CURRENT_PAGE_URL, start));
   } else if (parameter == "google:cursorPosition") {
@@ -601,10 +597,6 @@ bool TemplateURLRef::ParseParameter(size_t start,
                                         start));
   } else if (parameter == "google:instantExtendedEnabledKey") {
     url->insert(start, google_util::kInstantExtendedAPIParam);
-  } else if (parameter == "google:ntpIsThemedParameter") {
-    replacements->push_back(Replacement(GOOGLE_NTP_IS_THEMED, start));
-  } else if (parameter == "google:omniboxStartMarginParameter") {
-    replacements->push_back(Replacement(GOOGLE_OMNIBOX_START_MARGIN, start));
   } else if (parameter == "google:contextualSearchVersion") {
     replacements->push_back(
         Replacement(GOOGLE_CONTEXTUAL_SEARCH_VERSION, start));
@@ -903,17 +895,6 @@ std::string TemplateURLRef::HandleReplacements(
             &url);
         break;
 
-      case GOOGLE_BOOKMARK_BAR_PINNED:
-        if (search_terms_data.IsShowingSearchTermsOnSearchResultsPages()) {
-          // Log whether the bookmark bar is pinned when the user is seeing
-          // InstantExtended on the SRP.
-          DCHECK(!i->is_post_param);
-          HandleReplacement(
-              "bmbp", search_terms_args.bookmark_bar_pinned ? "1" : "0", *i,
-              &url);
-        }
-        break;
-
       case GOOGLE_CURRENT_PAGE_URL:
         DCHECK(!i->is_post_param);
         if (!search_terms_args.current_page_url.empty()) {
@@ -958,23 +939,6 @@ std::string TemplateURLRef::HandleReplacements(
                           &url);
         break;
 
-      case GOOGLE_NTP_IS_THEMED:
-        DCHECK(!i->is_post_param);
-        HandleReplacement(
-            std::string(), search_terms_data.NTPIsThemedParam(), *i, &url);
-        break;
-
-      case GOOGLE_OMNIBOX_START_MARGIN:
-        DCHECK(!i->is_post_param);
-        if (search_terms_args.enable_omnibox_start_margin) {
-          int omnibox_start_margin = search_terms_data.OmniboxStartMargin();
-          if (omnibox_start_margin >= 0) {
-            HandleReplacement("es_sm", base::IntToString(omnibox_start_margin),
-                              *i, &url);
-          }
-        }
-        break;
-
       case GOOGLE_CONTEXTUAL_SEARCH_VERSION:
         if (search_terms_args.contextual_search_params.version >= 0) {
           HandleReplacement(