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

chrome/browser/google/google_util_unittest.cc

Index: chrome/browser/google/google_util_unittest.cc
===================================================================
--- chrome/browser/google/google_util_unittest.cc	(revision 206485)
+++ chrome/browser/google/google_util_unittest.cc	(working copy)
@@ -2,11 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/command_line.h"
-#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/google/google_util.h"
-#include "chrome/common/chrome_switches.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using google_util::IsGoogleDomainUrl;
@@ -323,26 +320,4 @@
   EXPECT_FALSE(IsGoogleDomainUrl("doesnotexist://www.google.com",
                                  google_util::DISALLOW_SUBDOMAIN,
                                  google_util::DISALLOW_NON_STANDARD_PORTS));
-
-  // Test overriding with --instant-url works.
-  EXPECT_FALSE(IsGoogleDomainUrl("http://test.foo.com",
-                                 google_util::DISALLOW_SUBDOMAIN,
-                                 google_util::DISALLOW_NON_STANDARD_PORTS));
-  EXPECT_FALSE(IsGoogleDomainUrl("http://test.foo.com:1234",
-                                 google_util::DISALLOW_SUBDOMAIN,
-                                 google_util::DISALLOW_NON_STANDARD_PORTS));
-  CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-      switches::kInstantURL, "http://test.foo.com:1234/bar");
-  EXPECT_FALSE(IsGoogleDomainUrl("http://test.foo.com",
-                                 google_util::DISALLOW_SUBDOMAIN,
-                                 google_util::DISALLOW_NON_STANDARD_PORTS));
-  EXPECT_TRUE(IsGoogleDomainUrl("http://test.foo.com:1234",
-                                google_util::DISALLOW_SUBDOMAIN,
-                                google_util::DISALLOW_NON_STANDARD_PORTS));
-  EXPECT_FALSE(IsGoogleDomainUrl("file://test.foo.com:1234",
-                                 google_util::DISALLOW_SUBDOMAIN,
-                                 google_util::DISALLOW_NON_STANDARD_PORTS));
-  EXPECT_TRUE(IsGoogleDomainUrl("http://www.google.com",
-                                google_util::DISALLOW_SUBDOMAIN,
-                                google_util::DISALLOW_NON_STANDARD_PORTS));
 }