A working implementation of AQS (Assisted Query Stats).

chrome/browser/ui/search_engines/edit_search_engine_controller.cc

Index: chrome/browser/ui/search_engines/edit_search_engine_controller.cc
diff --git a/chrome/browser/ui/search_engines/edit_search_engine_controller.cc b/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
index 58562a3c8a5b86172741131497e92214064074f9..160f22e2cbc8ad48c11a96469134ff0681665f1b 100644
--- a/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
+++ b/chrome/browser/ui/search_engines/edit_search_engine_controller.cc
@@ -57,8 +57,8 @@ bool EditSearchEngineController::IsURLValid(
 
   // Replace any search term with a placeholder string and make sure the
   // resulting URL is valid.
-  return GURL(template_ref.ReplaceSearchTerms(ASCIIToUTF16("x"),
-      TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16())).is_valid();
+  return GURL(template_ref.ReplaceSearchTerms(
+      TemplateURLRef::SearchTermsArgs(ASCIIToUTF16("x")))).is_valid();
 }
 
 bool EditSearchEngineController::IsKeywordValid(
@@ -133,8 +133,8 @@ std::string EditSearchEngineController::GetFixedUpURL(
   TemplateURLData data;
   data.SetURL(url);
   TemplateURL t_url(profile_, data);
-  std::string expanded_url(t_url.url_ref().ReplaceSearchTerms(ASCIIToUTF16("x"),
-      TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
+  std::string expanded_url(t_url.url_ref().ReplaceSearchTerms(
+      TemplateURLRef::SearchTermsArgs(ASCIIToUTF16("x"))));
   url_parse::Parsed parts;
   std::string scheme(URLFixerUpper::SegmentURL(expanded_url, &parts));
   if (!parts.scheme.is_valid())
@@ -142,4 +142,3 @@ std::string EditSearchEngineController::GetFixedUpURL(
 
   return url;
 }
-