[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 4963eb2c3779f5f0f961e634b7708f3d6142c869..493292a58c868c6b2969e20d20ef23176605d4a7 100644
--- a/chrome/browser/search_engines/template_url.cc
+++ b/chrome/browser/search_engines/template_url.cc
@@ -87,6 +87,7 @@ const char kGoogleSearchFieldtrialParameter[] =
 #if defined (OS_ANDROID)
 const char kGoogleSearchVersion[] = "google:searchVersion";
 #endif
+const char kGoogleSessionToken[] = "google:sessionToken";
 const char kGoogleSourceIdParameter[] = "google:sourceId";
 const char kGoogleSuggestAPIKeyParameter[] = "google:suggestAPIKeyParameter";
 const char kGoogleSuggestClient[] = "google:suggestClient";
@@ -611,6 +612,8 @@ bool TemplateURLRef::ParseParameter(size_t start,
       url->insert(start, "gs_rn=42&");
     }
 #endif
+  } 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&");
@@ -976,6 +979,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;
+        if (!token.empty())
+          HandleReplacement("psi", token, *i, &url);
+        break;
+      }
+
       case GOOGLE_SUGGEST_CLIENT:
         HandleReplacement(
             std::string(), search_terms_data.GetSuggestClient(), *i, &url);