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

chrome/browser/search_engines/template_url.cc

Index: chrome/browser/search_engines/template_url.cc
diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc
index bf85e4ab66f1e9f7ef5b15855f01155e68bcc52a..24548a01e95f0a218f59d5e78c46c7b363c7ba27 100644
--- a/chrome/browser/search_engines/template_url.cc
+++ b/chrome/browser/search_engines/template_url.cc
@@ -52,6 +52,8 @@ static const char kGoogleBaseSuggestURLParameter[] =
     "google:baseSuggestURL";
 static const char kGoogleBaseSuggestURLParameterFull[] =
     "{google:baseSuggestURL}";
+static const char kGoogleInstantFieldTrialGroupParameter[] =
+    "google:instantFieldTrialGroupParameter";
 static const char kGoogleOriginalQueryForSuggestionParameter[] =
     "google:originalQueryForSuggestion";
 static const char kGoogleRLZParameter[] = "google:RLZ";
@@ -146,6 +148,9 @@ bool TemplateURLRef::ParseParameter(size_t start,
     replacements->push_back(Replacement(GOOGLE_BASE_URL, start));
   } else if (parameter == kGoogleBaseSuggestURLParameter) {
     replacements->push_back(Replacement(GOOGLE_BASE_SUGGEST_URL, start));
+  } else if (parameter == kGoogleInstantFieldTrialGroupParameter) {
+    replacements->push_back(Replacement(GOOGLE_INSTANT_FIELD_TRIAL_GROUP,
+                                        start));
   } else if (parameter == kGoogleOriginalQueryForSuggestionParameter) {
     replacements->push_back(Replacement(GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION,
                                         start));
@@ -201,7 +206,7 @@ std::string TemplateURLRef::ParseURL(const std::string& url,
 }
 
 void TemplateURLRef::ParseIfNecessary() const {
-  UIThreadSearchTermsData search_terms_data;
+  UIThreadSearchTermsData search_terms_data(NULL);
   ParseIfNecessaryUsingTermsData(search_terms_data);
 }
 
@@ -276,11 +281,12 @@ void TemplateURLRef::SetGoogleBaseURL(std::string* google_base_url) {
 }
 
 std::string TemplateURLRef::ReplaceSearchTerms(
+    Profile* profile,
     const TemplateURL& host,
     const string16& terms,
     int accepted_suggestion,
     const string16& original_query_for_suggestion) const {
-  UIThreadSearchTermsData search_terms_data;
+  UIThreadSearchTermsData search_terms_data(profile);
   return ReplaceSearchTermsUsingTermsData(host,
                                           terms,
                                           accepted_suggestion,
@@ -375,6 +381,10 @@ std::string TemplateURLRef::ReplaceSearchTermsUsingTermsData(
         url.insert(i->index, search_terms_data.GoogleBaseSuggestURLValue());
         break;
 
+      case GOOGLE_INSTANT_FIELD_TRIAL_GROUP:
+        url.insert(i->index, search_terms_data.InstantFieldTrialUrlParam());
+        break;
+
       case GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION:
         if (accepted_suggestion >= 0)
           url.insert(i->index, "oq=" + UTF16ToUTF8(encoded_original_query) +
@@ -435,7 +445,7 @@ std::string TemplateURLRef::ReplaceSearchTermsUsingTermsData(
 }
 
 bool TemplateURLRef::SupportsReplacement() const {
-  UIThreadSearchTermsData search_terms_data;
+  UIThreadSearchTermsData search_terms_data(NULL);
   return SupportsReplacementUsingTermsData(search_terms_data);
 }
 
@@ -446,7 +456,7 @@ bool TemplateURLRef::SupportsReplacementUsingTermsData(
 }
 
 bool TemplateURLRef::IsValid() const {
-  UIThreadSearchTermsData search_terms_data;
+  UIThreadSearchTermsData search_terms_data(NULL);
   return IsValidUsingTermsData(search_terms_data);
 }
 
@@ -595,7 +605,7 @@ GURL TemplateURL::GenerateFaviconURL(const GURL& url) {
 
 // static
 bool TemplateURL::SupportsReplacement(const TemplateURL* turl) {
-  UIThreadSearchTermsData search_terms_data;
+  UIThreadSearchTermsData search_terms_data(NULL);
   return SupportsReplacementUsingTermsData(turl, search_terms_data);
 }
 
@@ -665,7 +675,8 @@ void TemplateURL::EnsureKeyword() const {
   if (autogenerate_keyword_ && !keyword_generated_) {
     // Generate a keyword and cache it.
     keyword_ = TemplateURLService::GenerateKeyword(
-        TemplateURLService::GenerateSearchURL(this).GetWithEmptyPath(), true);
+        TemplateURLService::GenerateSearchURL(this, NULL).GetWithEmptyPath(),
+        true);
     keyword_generated_ = true;
   }
 }