A working implementation of AQS (Assisted Query Stats).

chrome/browser/search_engines/template_url_prepopulate_data.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/search_engines/template_url_prepopulate_data.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <locale.h>
 #endif
 
@@ skipping 1073 matching lines @@
   SEARCH_ENGINE_GOO,
   23,
 };
 
 const PrepopulatedEngine google = {
   L"Google",
   L"google.com",  // This will be dynamically updated by the TemplateURL system.
   "http://www.google.com/favicon.ico",
   "{google:baseURL}search?q={searchTerms}&{google:RLZ}"
       "{google:acceptedSuggestion}{google:originalQueryForSuggestion}"
+      "{google:assistedQueryStats}"

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

Nit: I'd probably wrap after the "search field trial" block if it fits

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

Done.

       "{google:searchFieldtrialParameter}sourceid=chrome&ie={inputEncoding}",
   "UTF-8",
   "{google:baseSuggestURL}search?{google:searchFieldtrialParameter}"
       "client=chrome&hl={language}&q={searchTerms}",
   "{google:baseURL}webhp?{google:RLZ}sourceid=chrome-instant&"
       "ie={inputEncoding}{google:instantEnabledParameter}{searchTerms}",
   SEARCH_ENGINE_GOOGLE,
   1,
 };
 
@@ skipping 2170 matching lines @@
                              PrefService::UNSYNCABLE_PREF);
   // Obsolete pref, for migration.
   prefs->RegisterIntegerPref(prefs::kGeoIDAtInstall,
                              -1,
                              PrefService::UNSYNCABLE_PREF);
 }
 
 int GetDataVersion(PrefService* prefs) {
   // Increment this if you change the above data in ways that mean users with
   // existing data should get a new version.
-  const int kCurrentDataVersion = 39;
+  const int kCurrentDataVersion = 40;
   // Allow tests to override the local version.
   return (prefs && prefs->HasPrefPath(prefs::kSearchProviderOverridesVersion)) ?
       prefs->GetInteger(prefs::kSearchProviderOverridesVersion) :
       kCurrentDataVersion;
 }
 
 TemplateURL* MakePrepopulatedTemplateURL(Profile* profile,
                                          const string16& name,
                                          const string16& keyword,
                                          const base::StringPiece& search_url,
@@ skipping 113 matching lines @@
          BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // We may get a valid URL, or we may get the Google prepopulate URL which
   // can't be converted directly to a GURL.  To handle the latter, we first
   // construct a TemplateURL from the provided |url|, then call
   // ReplaceSearchTerms().  This should return a valid URL even when the input
   // has Google base URLs.
   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(
+      SearchTermsArgs(ASCIIToUTF16("x"))));
   if (!as_gurl.is_valid())
     return SEARCH_ENGINE_OTHER;
 
   // Check using origins, in order to more aggressively match search engine
   // types for data imported from other browsers.
   //
   // First special-case Google, because the prepopulate URL for it will not
   // convert to a GURL and thus won't have an origin.  Instead see if the
   // incoming URL's host is "[*.]google.<TLD>".
   if (google_util::IsGoogleHostname(as_gurl.host(),
                                     google_util::DISALLOW_SUBDOMAIN))
     return google.type;
 
   // Now check the rest of the prepopulate data.
   GURL origin(as_gurl.GetOrigin());
   for (size_t i = 0; i < arraysize(kAllEngines); ++i) {
     GURL engine_url(kAllEngines[i]->search_url);
     if (engine_url.is_valid() && (origin == engine_url.GetOrigin()))
       return kAllEngines[i]->type;
   }
 
   return SEARCH_ENGINE_OTHER;
 }
 
 }  // namespace TemplateURLPrepopulateData