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

chrome/browser/search_engines/search_terms_data.cc

Index: chrome/browser/search_engines/search_terms_data.cc
===================================================================
--- chrome/browser/search_engines/search_terms_data.cc	(revision 206485)
+++ chrome/browser/search_engines/search_terms_data.cc	(working copy)
@@ -38,11 +38,6 @@
 }
 
 std::string SearchTermsData::GoogleBaseSuggestURLValue() const {
-  std::string base_suggest_url = CommandLine::ForCurrentProcess()->
-      GetSwitchValueASCII(switches::kGoogleBaseSuggestURL);
-  if (!base_suggest_url.empty())
-    return base_suggest_url;
-
   // Start with the Google base URL.
   const GURL base_url(GoogleBaseURLValue());
   DCHECK(base_url.is_valid());
@@ -100,6 +95,10 @@
       BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (google_base_url_)
     return *google_base_url_;
+  std::string base_url = CommandLine::ForCurrentProcess()->
+      GetSwitchValueASCII(switches::kGoogleBaseURL);
+  if (!base_url.empty())
+    return base_url;
   return profile_ ? GoogleURLTracker::GoogleURL(profile_).spec() :
       SearchTermsData::GoogleBaseURLValue();
 }