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

chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc

 // Copyright (c) 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 "base/command_line.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/search_engines/prepopulated_engines.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
@@ skipping 286 matching lines @@
   const char* kYahooURLs[] = {
       "http://search.yahoo.com/search?"
       "ei={inputEncoding}&fr=crmas&p={searchTerms}",
       "http://search.yahoo.com/search?p={searchTerms}"
   };
   for (size_t i = 0; i < arraysize(kYahooURLs); ++i) {
     EXPECT_EQ(SEARCH_ENGINE_YAHOO,
               TemplateURLPrepopulateData::GetEngineType(kYahooURLs[i]));
   }
   // URLs for engines not present in country-specific lists.
-  std::string kNigmaURL = "http://www.nigma.ru/?s={searchTerms}&arg1=value1";
   EXPECT_EQ(SEARCH_ENGINE_NIGMA,
-            TemplateURLPrepopulateData::GetEngineType(kNigmaURL));
+            TemplateURLPrepopulateData::GetEngineType(
+                "http://www.nigma.ru/?s={searchTerms}&arg1=value1"));
   // Search URL for which no prepopulated search provider exists.
-  std::string kExampleSearchURL = "http://example.net/search?q={searchTerms}";
   EXPECT_EQ(SEARCH_ENGINE_OTHER,
-            TemplateURLPrepopulateData::GetEngineType(kExampleSearchURL));
+            TemplateURLPrepopulateData::GetEngineType(
+                "http://example.net/search?q={searchTerms}"));
   EXPECT_EQ(SEARCH_ENGINE_OTHER,
             TemplateURLPrepopulateData::GetEngineType("invalid:search:url"));
+
+  // URL that doesn't look Google-related, but matches a Google base URL
+  // specified on the command line.
+  const std::string foo_url("http://www.foo.com/search?q={searchTerms}");
+  EXPECT_EQ(SEARCH_ENGINE_OTHER,
+            TemplateURLPrepopulateData::GetEngineType(foo_url));
+  CommandLine::ForCurrentProcess()->AppendSwitchASCII(switches::kGoogleBaseURL,
+                                                      "http://www.foo.com/");
+  EXPECT_EQ(SEARCH_ENGINE_GOOGLE,
+            TemplateURLPrepopulateData::GetEngineType(foo_url));
 }
 
 TEST(TemplateURLPrepopulateDataTest, GetLogoURLGoogle) {
   TemplateURLData data;
   data.SetURL("http://www.google.com/");
   TemplateURL turl(NULL, data);
   GURL logo_100_url = TemplateURLPrepopulateData::GetLogoURL(
       turl, TemplateURLPrepopulateData::LOGO_100_PERCENT);
   GURL logo_200_url = TemplateURLPrepopulateData::GetLogoURL(
       turl, TemplateURLPrepopulateData::LOGO_200_PERCENT);
@@ skipping 15 matching lines @@
 
 TEST(TemplateURLPrepopulateDataTest, GetLogoURLInvalid) {
   TemplateURLData data;
   data.SetURL("http://invalid:search:url/");
   TemplateURL turl(NULL, data);
   GURL logo_url = TemplateURLPrepopulateData::GetLogoURL(
       turl, TemplateURLPrepopulateData::LOGO_100_PERCENT);
 
   EXPECT_TRUE(logo_url.is_empty());
 }