A working implementation of AQS (Assisted Query Stats).

chrome/browser/search_engines/template_url_service_unittest.cc

Index: chrome/browser/search_engines/template_url_service_unittest.cc
diff --git a/chrome/browser/search_engines/template_url_service_unittest.cc b/chrome/browser/search_engines/template_url_service_unittest.cc
index 92bdb3715b9a44d5024d9c58807f370b7fb85053..316d7a1caf719bcacfabc9d23dc705fc3123002d 100644
--- a/chrome/browser/search_engines/template_url_service_unittest.cc
+++ b/chrome/browser/search_engines/template_url_service_unittest.cc
@@ -1014,7 +1014,7 @@ TEST_F(TemplateURLServiceTest, ChangeGoogleBaseValue) {
   EXPECT_EQ("google.co.uk", t_url->url_ref().GetHost());
   EXPECT_EQ(ASCIIToUTF16("google.co.uk"), t_url->keyword());
   EXPECT_EQ("http://google.co.uk/?q=x", t_url->url_ref().ReplaceSearchTerms(
-      ASCIIToUTF16("x"), TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
+      TemplateURLRef::SearchTermsArgs(ASCIIToUTF16("x"))));
 
   // Now add a manual entry and then change the Google base URL such that the
   // autogenerated Google search keyword would conflict.
@@ -1062,8 +1062,8 @@ TEST_F(TemplateURLServiceTest, GenerateVisitOnKeyword) {
       HistoryServiceFactory::GetForProfile(test_util_.profile(),
                                            Profile::EXPLICIT_ACCESS);
   history->AddPage(
-      GURL(t_url->url_ref().ReplaceSearchTerms(ASCIIToUTF16("blah"),
-          TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16())),
+      GURL(t_url->url_ref().ReplaceSearchTerms(
+          TemplateURLRef::SearchTermsArgs(ASCIIToUTF16("blah")))),
       NULL, 0, GURL(), content::PAGE_TRANSITION_KEYWORD,
       history::RedirectList(), history::SOURCE_BROWSED, false);