Move the query to the start of the Google search URL in hopes of being slightly more user-friendly.

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/file_util.h"
 #include "base/memory/scoped_vector.h"
 #include "base/scoped_temp_dir.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url.h"
@@ skipping 108 matching lines @@
 
   ASSERT_EQ(1u, t_urls.size());
   EXPECT_EQ(ASCIIToUTF16("foo"), t_urls[0]->short_name());
   EXPECT_EQ(ASCIIToUTF16("fook"), t_urls[0]->keyword());
   EXPECT_EQ("foo.com", t_urls[0]->url_ref().GetHost());
   EXPECT_EQ("foi.com", t_urls[0]->favicon_url().host());
   EXPECT_EQ(1u, t_urls[0]->input_encodings().size());
   EXPECT_EQ(1001, t_urls[0]->prepopulate_id());
 }
 
-TEST(TemplateURLPrepopulateDataTest, GetEngineName) {
-  EXPECT_EQ(ASCIIToUTF16("Atlas"),
-       TemplateURLPrepopulateData::GetEngineName("http://search.atlas.cz/"));
-  EXPECT_EQ(ASCIIToUTF16("Google"),
-       TemplateURLPrepopulateData::GetEngineName("http://www.google.com/"));
-  EXPECT_EQ(ASCIIToUTF16("example.com"),
-            TemplateURLPrepopulateData::GetEngineName("http://example.com/"));
-  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_UNKNOWN_SEARCH_ENGINE_NAME),
-            TemplateURLPrepopulateData::GetEngineName("!@#"));
-}
-
 TEST(TemplateURLPrepopulateDataTest, GetEngineTypeBasic) {
   EXPECT_EQ(SEARCH_ENGINE_OTHER,
             TemplateURLPrepopulateData::GetEngineType("http://example.com/"));
   EXPECT_EQ(SEARCH_ENGINE_ASK,
             TemplateURLPrepopulateData::GetEngineType("http://www.ask.com/"));
   EXPECT_EQ(SEARCH_ENGINE_OTHER,
        TemplateURLPrepopulateData::GetEngineType("http://search.atlas.cz/"));
   EXPECT_EQ(SEARCH_ENGINE_GOOGLE,
        TemplateURLPrepopulateData::GetEngineType("http://www.google.com/"));
 }
 
 TEST_F(TemplateURLPrepopulateDataTest, GetEngineTypeAdvanced) {
   // Google URLs in different forms.
   const char* kGoogleURLs[] = {
     // Original with google:baseURL:
-    "{google:baseURL}search?{google:RLZ}{google:acceptedSuggestion}"
-    "{google:originalQueryForSuggestion}{google:searchFieldtrialParameter}"
-    "sourceid=chrome&ie={inputEncoding}&q={searchTerms}",
-    // Custom with google.com:
+    "{google:baseURL}search?q={searchTerms}&{google:RLZ}"
+    "{google:acceptedSuggestion}{google:originalQueryForSuggestion}"
+    "{google:searchFieldtrialParameter}sourceid=chrome&ie={inputEncoding}",
+    // Custom with google.com and reordered query params:
     "http://google.com/search?{google:RLZ}{google:acceptedSuggestion}"
     "{google:originalQueryForSuggestion}{google:searchFieldtrialParameter}"
     "sourceid=chrome&ie={inputEncoding}&q={searchTerms}",
-    // Custom with a country TLD:
-    "http://www.google.ru/search?{google:RLZ}{google:acceptedSuggestion}"
-    "{google:originalQueryForSuggestion}{google:searchFieldtrialParameter}"
-    "sourceid=chrome&ie={inputEncoding}&q={searchTerms}"
+    // Custom with a country TLD and almost no query params:
+    "http://www.google.ru/search?q={searchTerms}"
   };
   for (size_t i = 0; i < arraysize(kGoogleURLs); ++i) {
     EXPECT_EQ(SEARCH_ENGINE_GOOGLE,
               TemplateURLPrepopulateData::GetEngineType(kGoogleURLs[i]));
   }
   // Non-Google URLs.
   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));
   // 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));
   EXPECT_EQ(SEARCH_ENGINE_OTHER,
             TemplateURLPrepopulateData::GetEngineType("invalid:search:url"));
 }