Add a URL param to indicate group selection in Instant field trial.

chrome/browser/search_engines/template_url_prepopulate_data.cc

 // Copyright (c) 2011 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 1164 matching lines @@
   IDR_SEARCH_ENGINE_LOGO_GOO,
   23,
 };
 
 const PrepopulatedEngine google = {
   L"Google",
   NULL,
   "http://www.google.com/favicon.ico",
   L"{google:baseURL}search?{google:RLZ}{google:acceptedSuggestion}"
       L"{google:originalQueryForSuggestion}{google:searchFieldtrialParameter}"
+      L"{instantFieldTrialGroupParameter}"
       L"sourceid=chrome&ie={inputEncoding}&q={searchTerms}",
   "UTF-8",
   L"{google:baseSuggestURL}search?{google:searchFieldtrialParameter}"
+      L"{instantFieldTrialGroupParameter}"
       L"client=chrome&hl={language}&q={searchTerms}",
-  L"{google:baseURL}webhp?{google:RLZ}sourceid=chrome-instant"
-      L"&ie={inputEncoding}&ion=1{searchTerms}&nord=1",
+  L"{google:baseURL}webhp?{google:RLZ}sourceid=chrome-instant&"
+      L"{instantFieldTrialGroupParameter}"
+      L"ie={inputEncoding}&ion=1{searchTerms}&nord=1",
   SEARCH_ENGINE_GOOGLE,
   IDR_SEARCH_ENGINE_LOGO_GOOGLE,
   1,
 };
 
 const PrepopulatedEngine guruji = {
   L"guruji",
   L"guruji.com",
   "http://guruji.com/favicon.ico",
   L"http://guruji.com/search?q={searchTerms}",
@@ skipping 2151 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 = 35;
+  const int kCurrentDataVersion = 36;
   if (!prefs)
     return kCurrentDataVersion;
   // If a version number exist in the preferences file, it overrides the
   // version of the built-in data.
   int version =
     prefs->GetInteger(prefs::kSearchProviderOverridesVersion);
   return (version >= 0) ? version : kCurrentDataVersion;
 }
 
 TemplateURL* MakePrepopulatedTemplateURL(const wchar_t* name,
@@ skipping 155 matching lines @@
   // It is much faster to parse the url without generating the search URL, so
   // try that first.  If it fails, fallback to the slow method.
   std::string url_utf8_string(ToUTF8(url_string));
   GURL url(url_utf8_string);
   if (!url.is_valid()) {
     TemplateURL turl;
     turl.SetURL(url_utf8_string, 0, 0);
 
     UIThreadSearchTermsData search_terms_data;
     url = TemplateURLService::GenerateSearchURLUsingTermsData(
-        &turl, search_terms_data);
+        NULL, &turl, search_terms_data);
   }
   return url.GetOrigin();
 }
 
 TemplateURL* GetEngineForOrigin(PrefService* prefs, const GURL& url_to_find) {
   GURL origin_to_find = url_to_find.GetOrigin();
 
   // Let's first try to find the url in the defaults. (In case the name
   // of logo is different for the current locale versus others.)
   ScopedVector<TemplateURL> loaded_urls;
@@ skipping 25 matching lines @@
   for (size_t i = 0; i < arraysize(kAllEngines); ++i) {
     std::string url_utf8_string(ToUTF8(kAllEngines[i]->search_url));
     GURL url(url_utf8_string);
     if (origin_to_find == url.GetOrigin())
       return kAllEngines[i]->logo_id;
   }
   return kNoSearchEngineLogo;
 }
 
 }  // namespace TemplateURLPrepopulateData