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.h

 // 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.
 
 #ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_PREPOPULATE_DATA_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_PREPOPULATE_DATA_H_
 #pragma once
 
 #include <stddef.h>
 #include <string>
@@ skipping 25 matching lines @@
 void GetPrepopulatedEngines(Profile* profile,
                             std::vector<TemplateURL*>* t_urls,
                             size_t* default_search_provider_index);
 
 // Returns the default search provider specified by the prepopulate data.
 // The caller owns the returned value, which may be NULL.
 // If |profile| is NULL, any search provider overrides from the preferences are
 // not used.
 TemplateURL* GetPrepopulatedDefaultSearch(Profile* profile);
 
-// Both the next two functions use same-origin checks unless the |url| is a
-// Google seach URL, in which case we'll identify any valid Google hostname, or
-// the unsubstituted Google prepopulate URL, as "Google".
-
-// Returns the short name for the matching engine, or url.host() if no engines
-// match.  If no engines match and the |url| can't be converted to a valid GURL,
-// returns the string in IDS_UNKNOWN_SEARCH_ENGINE_NAME.
-string16 GetEngineName(const std::string& url);
-
 // Returns the type of the matching engine, or SEARCH_ENGINE_OTHER if no engines
-// match.
+// match.  This uses same-origin checks unless the |url| is a Google seach URL,
+// in which case we'll identify any valid Google hostname as "Google".
+//
+// NOTE: Must be called on the UI thread.
 SearchEngineType GetEngineType(const std::string& url);
 
 }  // namespace TemplateURLPrepopulateData
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_PREPOPULATE_DATA_H_