Stop depending on InstantService from BaseSearchProvider

components/search_engines/template_url.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 "components/search_engines/template_url.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 163 matching lines @@
 
 
 // TemplateURLRef::SearchTermsArgs --------------------------------------------
 
 TemplateURLRef::SearchTermsArgs::SearchTermsArgs(
     const base::string16& search_terms)
     : search_terms(search_terms),
       input_type(metrics::OmniboxInputType::INVALID),
       accepted_suggestion(NO_SUGGESTIONS_AVAILABLE),
       cursor_position(base::string16::npos),
-      omnibox_start_margin(-1),
+      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),
       contextual_search_params(ContextualSearchParams()) {
 }
 
 TemplateURLRef::SearchTermsArgs::~SearchTermsArgs() {
 }
@@ skipping 718 matching lines @@
         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.omnibox_start_margin >= 0) {
-          HandleReplacement(
-              "es_sm",
-              base::IntToString(search_terms_args.omnibox_start_margin),
-              *i,
-              &url);
+        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(
               "ctxs",
               base::IntToString(
                   search_terms_args.contextual_search_params.version),
               *i,
@@ skipping 505 matching lines @@
       // patterns. This means that given patterns
       //    [ "http://foo/#q={searchTerms}", "http://foo/?q={searchTerms}" ],
       // calling ExtractSearchTermsFromURL() on "http://foo/?q=bar#q=' would
       // return false. This is important for at least Google, where such URLs
       // are invalid.
       return !search_terms->empty();
     }
   }
   return false;
 }