[AiS] Provide Answers queries with a session token.

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 874b4bbaa33bed834f6211b2bcf0b8aac9fc5ff7..2661bc0bc0535f68fd1916c72ded270f87ac521e 100644
--- a/chrome/browser/search_engines/template_url.cc
+++ b/chrome/browser/search_engines/template_url.cc
@@ -84,6 +84,7 @@ const char kGoogleRLZParameter[] = "google:RLZ";
 const char kGoogleSearchClient[] = "google:searchClient";
 const char kGoogleSearchFieldtrialParameter[] =
     "google:searchFieldtrialParameter";
+const char kGoogleSessionToken[] = "google:sessionToken";
 const char kGoogleSourceIdParameter[] = "google:sourceId";
 const char kGoogleSuggestAPIKeyParameter[] = "google:suggestAPIKeyParameter";
 const char kGoogleSuggestClient[] = "google:suggestClient";
@@ -601,6 +602,8 @@ bool TemplateURLRef::ParseParameter(size_t start,
     replacements->push_back(Replacement(GOOGLE_SEARCH_CLIENT, start));
   } else if (parameter == kGoogleSearchFieldtrialParameter) {
     replacements->push_back(Replacement(GOOGLE_SEARCH_FIELDTRIAL_GROUP, start));
+  } else if (parameter == kGoogleSessionToken) {
+    replacements->push_back(Replacement(GOOGLE_SESSION_TOKEN, start));
   } else if (parameter == kGoogleSourceIdParameter) {
 #if defined(OS_ANDROID)
     url->insert(start, "sourceid=chrome-mobile&");
@@ -966,6 +969,13 @@ std::string TemplateURLRef::HandleReplacements(
         // url.insert(i->index, used_www ? "gcx=w&" : "gcx=c&");
         break;
 
+      case GOOGLE_SESSION_TOKEN: {
+        std::string token = search_terms_args.session_token;

[Peter Kasting, 2014/05/09 21:35:07]

Nit: Either inline this directly into the uses below, or use a const string&.

+        if (!token.empty())
+          HandleReplacement("psi", token, *i, &url);
+        break;
+      }
+
       case GOOGLE_SUGGEST_CLIENT:
         HandleReplacement(
             std::string(), search_terms_data.GetSuggestClient(), *i, &url);