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

chrome/browser/ui/toolbar/toolbar_model_impl.cc

Index: chrome/browser/ui/toolbar/toolbar_model_impl.cc
===================================================================
--- chrome/browser/ui/toolbar/toolbar_model_impl.cc	(revision 207943)
+++ chrome/browser/ui/toolbar/toolbar_model_impl.cc	(working copy)
@@ -266,10 +266,18 @@
   DCHECK(web_contents);
   const NavigationController& nav_controller = web_contents->GetController();
   const NavigationEntry* entry = nav_controller.GetVisibleEntry();
+  // NOTE: If the first condition in this next statement succeeds, |entry| must
+  // be non-NULL.
   if ((entry != nav_controller.GetLastCommittedEntry()) &&
       (entry->GetSSL().security_style == content::SECURITY_STYLE_UNKNOWN))
     return search_terms;
 
+  // If the URL is using a Google base URL specified via the command line, skip
+  // the security check below.
+  if (entry &&
+      google_util::StartsWithCommandLineGoogleBaseURL(entry->GetVirtualURL()))
+    return search_terms;
+
   // Otherwise, extract search terms for HTTPS pages that do not have a security
   // error.
   ToolbarModel::SecurityLevel security_level = GetSecurityLevel();