Add Android-specific parameters to search_engines/

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 f53a73162bf8ce92124cf3369bc47412b52f1bfc..6c0c3d08ed5bdebc372c8816be8a56b822776e8d 100644
--- a/chrome/browser/search_engines/template_url.cc
+++ b/chrome/browser/search_engines/template_url.cc
@@ -55,6 +55,7 @@ const char kGoogleInstantEnabledParameter[] = "google:instantEnabledParameter";
 const char kGoogleOriginalQueryForSuggestionParameter[] =
     "google:originalQueryForSuggestion";
 const char kGoogleRLZParameter[] = "google:RLZ";
+const char kGoogleSearchClient[] = "google:searchClient";
 // Same as kSearchTermsParameter, with no escaping.
 const char kGoogleSearchFieldtrialParameter[] =
     "google:searchFieldtrialParameter";
@@ -317,6 +318,14 @@ std::string TemplateURLRef::ReplaceSearchTermsUsingTermsData(
         break;
       }
 
+      case GOOGLE_SEARCH_CLIENT: {
+        std::string client = search_terms_data.GetSearchClient();
+        if (!client.empty()) {

[Peter Kasting, 2012/12/05 21:28:47]

Nit: No {}

[gone, 2012/12/06 01:43:58]

Done.

+          url.insert(i->index, "client=" + client + "&");

[Peter Kasting, 2012/12/05 21:28:47]

Make sure the search folks like the "client=<whatever>&sourceid=chrome"
combination -- I say this because we (Chrome all platforms) used to use
"client=chrome" and changed away from that, so I just want to make sure the
current Android impl isn't using some obsolete set of params.

[gone, 2012/12/06 01:43:58]

We've apparently been using this combination on our m18 builds; one of our PMs
says that the data has looked at since we first introduced it.

One thing he did mention, however, is that the sourceid is hard-coded to
"chrome-mobile" on mobile devices.  I've had to introduce a change to swap that
out for mobile devices.  Chrome for iOS apparently also uses this sourceid, but
I haven't been able to pinpoint where it occurs.

+        }
+        break;
+      }
+
       case GOOGLE_SEARCH_FIELDTRIAL_GROUP:
         // We are not currently running any fieldtrials that modulate the search
         // url.  If we do, then we'd have some conditional insert such as:
@@ -548,6 +557,8 @@ bool TemplateURLRef::ParseParameter(size_t start,
                                         start));
   } else if (parameter == kGoogleRLZParameter) {
     replacements->push_back(Replacement(GOOGLE_RLZ, start));
+  } else if (parameter == kGoogleSearchClient) {
+    replacements->push_back(Replacement(GOOGLE_SEARCH_CLIENT, start));
   } else if (parameter == kGoogleSearchFieldtrialParameter) {
     replacements->push_back(Replacement(GOOGLE_SEARCH_FIELDTRIAL_GROUP, start));
   } else if (parameter == kGoogleSuggestAPIKeyParameter) {