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

chrome/browser/search_engines/template_url_service.h

Index: chrome/browser/search_engines/template_url_service.h
===================================================================
--- chrome/browser/search_engines/template_url_service.h	(revision 208572)
+++ chrome/browser/search_engines/template_url_service.h	(working copy)
@@ -65,6 +65,7 @@
                            public content::NotificationObserver,
                            public syncer::SyncableService {
  public:
+  typedef std::map<string16, TemplateURL*> KeywordToTemplateMap;
   typedef std::map<std::string, std::string> QueryTerms;
   typedef std::vector<TemplateURL*> TemplateURLVector;
   // Type for a static function pointer that acts as a time source.
@@ -118,12 +119,12 @@
                          const GURL& url,
                          TemplateURL** template_url_to_replace);
 
-  // Returns (in |matches|) all keywords beginning with |prefix|, sorted
-  // shortest-first. If support_replacement_only is true, only keywords that
-  // support replacement are returned.
+  // Returns (in |matches|) all TemplateURLs whose keywords begin with |prefix|,
+  // sorted shortest keyword-first. If |support_replacement_only| is true, only
+  // TemplateURLs that support replacement are returned.
   void FindMatchingKeywords(const string16& prefix,
                             bool support_replacement_only,
-                            std::vector<string16>* matches) const;
+                            TemplateURLVector* matches) const;
 
   // Looks up |keyword| and returns the element it maps to.  Returns NULL if
   // the keyword was not found.
@@ -364,7 +365,6 @@
 
   friend class TemplateURLServiceTestUtil;
 
-  typedef std::map<string16, TemplateURL*> KeywordToTemplateMap;
   typedef std::map<std::string, TemplateURL*> GUIDToTemplateMap;
 
   // Declaration of values to be used in an enumerated histogram to tally