Replace --google-base-suggest-url and --instant-url with --google-base-url.

chrome/browser/autocomplete/search_provider.h

 // 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.
 //
 // This file contains the Search autocomplete provider.  This provider is
 // responsible for all autocomplete entries that start with "Search <engine>
 // for ...", including searching for the current input string, search
 // history, and search suggestions.  An instance of it gets created and
 // managed by the autocomplete controller.
 
@@ skipping 43 matching lines @@
                        public net::URLFetcherDelegate {
  public:
   // ID used in creating URLFetcher for default provider's suggest results.
   static const int kDefaultProviderURLFetcherID;
 
   // ID used in creating URLFetcher for keyword provider's suggest results.
   static const int kKeywordProviderURLFetcherID;
 
   SearchProvider(AutocompleteProviderListener* listener, Profile* profile);
 
-  // Returns an AutocompleteMatch representing a search for |query_string|
-  // using the provider identified by |keyword|. |is_keyword| should be true if
-  // |input| represents a keyword search (even if it's for the default search
-  // provider). |input_text| (the original input text) and |accepted_suggestion|
-  // are used to generate Assisted Query Stats.
-  // Returns a match with an invalid destination_url in case of any errors.
+  // Returns an AutocompleteMatch with the given |autocomplete_provider|,
+  // |relevance|, and |type|, which represents a search via |template_url| for
+  // |query_string|.  If |template_url| is NULL, returns a match with an invalid
+  // destination URL.
+  //
+  // |input_text| is the original user input, which may differ from
+  // |query_string|; e.g. the user typed "foo" and got a search suggestion of
+  // "food", which we're now marking up.  This is used to highlight portions of
+  // the match contents to distinguish locally-typed text from suggested text.
+  //
+  // |input| and |is_keyword| are 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 along
+  // with |input_text| 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.
   static AutocompleteMatch CreateSearchSuggestion(
-      Profile* profile,
       AutocompleteProvider* autocomplete_provider,
-      const AutocompleteInput& input,
+      int relevance,
+      AutocompleteMatch::Type type,
+      const TemplateURL* template_url,
       const string16& query_string,
       const string16& input_text,
-      int relevance,
-      AutocompleteMatch::Type type,
+      const AutocompleteInput& input,
+      bool is_keyword,
       int accepted_suggestion,
-      bool is_keyword,
-      const string16& keyword,
-      int omnibox_start_margin);
+      int omnibox_start_margin,
+      bool append_extra_query_params);
 
   // AutocompleteProvider:
   virtual void AddProviderInfo(ProvidersInfo* provider_info) const OVERRIDE;
   virtual void ResetSession() OVERRIDE;
 
   // Marks the instant query as done. If |input_text| is non-empty this changes
   // the 'search what you typed' results text to |input_text| +
   // |suggestion.text|. |input_text| is the text the user input into the edit.
   // |input_text| differs from |input_.text()| if the input contained
   // whitespace.
@@ skipping 463 matching lines @@
   // See comments for SuppressSearchSuggestions().
   bool suppress_search_suggestions_;
 
   // Start margin of the omnibox. Used to construct search URLs.
   int omnibox_start_margin_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_SEARCH_PROVIDER_H_