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

chrome/browser/ui/toolbar/toolbar_model_impl.cc

 // Copyright 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.
 
 #include "chrome/browser/ui/toolbar/toolbar_model_impl.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
@@ skipping 248 matching lines @@
     return string16();  // We mainly do this to enforce the subsequent DCHECK.
 
   // If the page is still loading and the security style is unknown, consider
   // the page secure.  Without this, after the user hit enter on some search
   // terms, the omnibox would change to displaying the loading URL before
   // changing back to the search terms once they could be extracted, thus
   // causing annoying flicker.
   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();
   return ((security_level == NONE) || (security_level == SECURITY_ERROR)) ?
       string16() : search_terms;
 }