A working implementation of AQS (Assisted Query Stats).

chrome/browser/autocomplete/search_provider.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 "chrome/browser/autocomplete/search_provider.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/callback.h"
@@ skipping 573 matching lines @@
     (*list)[i].set_relevance(CalculateRelevanceForNavigation(is_keyword) +
                              (list->size() - i - 1));
   }
 }
 
 net::URLFetcher* SearchProvider::CreateSuggestFetcher(
     int id,
     const TemplateURLRef& suggestions_url,
     const string16& text) {
   DCHECK(suggestions_url.SupportsReplacement());
-  net::URLFetcher* fetcher = content::URLFetcher::Create(id,
-      GURL(suggestions_url.ReplaceSearchTerms(text,
-          TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16())),
+  net::URLFetcher* fetcher = content::URLFetcher::Create(
+      id, GURL(suggestions_url.ReplaceSearchTerms(SearchTermsArgs(text))),
       net::URLFetcher::GET, this);
   fetcher->SetRequestContext(profile_->GetRequestContext());
   fetcher->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES);
   fetcher->Start();
   return fetcher;
 }
 
 bool SearchProvider::ParseSuggestResults(Value* root_val, bool is_keyword) {
   // TODO(pkasting): Fix |have_suggest_results_|; see http://crbug.com/130631
   have_suggest_results_ = false;
@@ skipping 445 matching lines @@
   }
   match.fill_into_edit.append(query_string);
   // Not all suggestions start with the original input.
   if (!input_.prevent_inline_autocomplete() &&
       !match.fill_into_edit.compare(search_start, input_text.length(),
                                    input_text))
     match.inline_autocomplete_offset = search_start + input_text.length();
 
   const TemplateURLRef& search_url = provider_url->url_ref();
   DCHECK(search_url.SupportsReplacement());
-  match.destination_url = GURL(search_url.ReplaceSearchTerms(query_string,
-      accepted_suggestion, input_text));
+  match.search_terms_args.reset(new SearchTermsArgs(query_string));
+  match.search_terms_args->original_query = input_text;
+  match.search_terms_args->accepted_suggestion = accepted_suggestion;
+  // This is the initial replacement, which is necessary for URL dedupping

[Peter Kasting, 2012/06/16 03:14:17]

Nit: How about:

"This is the destination URL sans assisted query stats.  This must be set so the
AutocompleteController can properly de-dupe; the controller will eventually
overwrite it before it reaches the user."

[Bart N, 2012/06/16 23:38:10]

Done.

+  // by AutocompleteController.
+  match.destination_url = GURL(search_url.ReplaceSearchTerms(

[Peter Kasting, 2012/06/16 03:14:17]

Nit: Can this be wrapped after '=' instead?

[Bart N, 2012/06/16 23:38:10]

Done.

+      *match.search_terms_args.get()));
 
   // Search results don't look like URLs.
   match.transition = is_keyword ?
       content::PAGE_TRANSITION_KEYWORD : content::PAGE_TRANSITION_GENERATED;
 
   // Try to add |match| to |map|.  If a match for |query_string| is already in
   // |map|, replace it if |match| is more relevant.
   // NOTE: Keep this ToLower() call in sync with url_database.cc.
   const std::pair<MatchMap::iterator, bool> i = map->insert(
       std::pair<string16, AutocompleteMatch>(
@@ skipping 71 matching lines @@
       ACMatchClassification::NONE, &match.description_class);
   return match;
 }
 
 void SearchProvider::UpdateDone() {
   // We're done when there are no more suggest queries pending (this is set to 1
   // when the timer is started) and we're not waiting on instant.
   done_ = ((suggest_results_pending_ == 0) &&
            (instant_finalized_ || !InstantController::IsEnabled(profile_)));
 }