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

chrome/browser/search_engines/util.cc

Index: chrome/browser/search_engines/util.cc
===================================================================
--- chrome/browser/search_engines/util.cc	(revision 208572)
+++ chrome/browser/search_engines/util.cc	(working copy)
@@ -39,6 +39,21 @@
   return default_provider->short_name();
 }
 
+GURL GetDefaultSearchURLForSearchTerms(Profile* profile,
+                                       const string16& terms) {
+  DCHECK(profile);
+  const TemplateURL* default_provider =
+      TemplateURLServiceFactory::GetForProfile(profile)->
+      GetDefaultSearchProvider();
+  if (!default_provider)
+    return GURL();
+  const TemplateURLRef& search_url = default_provider->url_ref();
+  DCHECK(search_url.SupportsReplacement());
+  TemplateURLRef::SearchTermsArgs search_terms_args(terms);
+  search_terms_args.append_extra_query_params = true;
+  return GURL(search_url.ReplaceSearchTerms(search_terms_args));
+}
+
 void RemoveDuplicatePrepopulateIDs(
     WebDataService* service,
     const ScopedVector<TemplateURL>& prepopulated_urls,