Stop depending on InstantService from BaseSearchProvider

chrome/browser/autocomplete/base_search_provider.h

 // 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.
 //
 // This class contains common functionality for search-based autocomplete
 // providers. Search provider and zero suggest provider both use it for common
 // functionality.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_BASE_SEARCH_PROVIDER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_BASE_SEARCH_PROVIDER_H_
@@ skipping 318 matching lines @@
   // Returns an AutocompleteMatch with the given |autocomplete_provider|
   // for the search |suggestion|, which represents a search via |template_url|.
   // If |template_url| is NULL, returns a match with an invalid destination URL.
   //
   // |input| is the original user input. Text in the input is used to highlight
   // portions of the match contents to distinguish locally-typed text from
   // suggested text.
   //
   // |input| is also necessary for various other details, like whether we should
   // allow inline autocompletion and what the transition type should be.
-  // |accepted_suggestion| and |omnibox_start_margin| are used to generate
-  // Assisted Query Stats.
+  // |accepted_suggestion| is used to generate Assisted Query Stats.
   // |append_extra_query_params| should be set if |template_url| is the default
   // search engine, so the destination URL will contain any
   // command-line-specified query params.
   // |from_app_list| should be set if the search was made from the app list.
   static AutocompleteMatch CreateSearchSuggestion(
       AutocompleteProvider* autocomplete_provider,
       const AutocompleteInput& input,
       const SuggestResult& suggestion,
       const TemplateURL* template_url,
       const SearchTermsData& search_terms_data,
       int accepted_suggestion,
-      int omnibox_start_margin,
       bool append_extra_query_params,
       bool from_app_list);
 
   // Parses JSON response received from the provider, stripping XSSI
   // protection if needed. Returns the parsed data if successful, NULL
   // otherwise.
   static scoped_ptr<base::Value> DeserializeJsonData(std::string json_data);
 
   // Returns whether the requirements for requesting zero suggest results
   // are met. The requirements are
@@ skipping 157 matching lines @@
 
   // True if this provider's results are being displayed in the app list. By
   // default this is false, meaning that the results will be shown in the
   // omnibox.
   bool in_app_list_;
 
   DISALLOW_COPY_AND_ASSIGN(BaseSearchProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_BASE_SEARCH_PROVIDER_H_