A working implementation of AQS (Assisted Query Stats).

chrome/browser/search_engines/template_url_prepopulate_data.cc

Index: chrome/browser/search_engines/template_url_prepopulate_data.cc
diff --git a/chrome/browser/search_engines/template_url_prepopulate_data.cc b/chrome/browser/search_engines/template_url_prepopulate_data.cc
index 7eccfdb12b298dcb36b4f7b180c6904254447298..77c4fcd5bc7a6b43b1006fe2970eaeddae70923f 100644
--- a/chrome/browser/search_engines/template_url_prepopulate_data.cc
+++ b/chrome/browser/search_engines/template_url_prepopulate_data.cc
@@ -1091,7 +1091,8 @@ const PrepopulatedEngine google = {
   "http://www.google.com/favicon.ico",
   "{google:baseURL}search?q={searchTerms}&{google:RLZ}"
       "{google:acceptedSuggestion}{google:originalQueryForSuggestion}"
-      "{google:searchFieldtrialParameter}sourceid=chrome&ie={inputEncoding}",
+      "{google:assistedQueryStats}{google:searchFieldtrialParameter}"
+      "sourceid=chrome&ie={inputEncoding}",
   "UTF-8",
   "{google:baseSuggestURL}search?{google:searchFieldtrialParameter}"
       "client=chrome&hl={language}&q={searchTerms}",
@@ -3418,8 +3419,8 @@ SearchEngineType GetEngineType(const std::string& url) {
   TemplateURLData data;
   data.SetURL(url);
   TemplateURL turl(NULL, data);
-  GURL as_gurl(turl.url_ref().ReplaceSearchTerms(ASCIIToUTF16("x"),
-      TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
+  GURL as_gurl(turl.url_ref().ReplaceSearchTerms(
+      TemplateURLRef::SearchTermsArgs(ASCIIToUTF16("x"))));
   if (!as_gurl.is_valid())
     return SEARCH_ENGINE_OTHER;