[TTS] Request Now on Tap data in the Resolve request.

components/search_engines/template_url.cc

Index: components/search_engines/template_url.cc
diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc
index a3be5cff8ebc067e03bc80fb10cf22c57bc3372d..356bc9a2f84248421e61e094ccb6931219f0a8b7 100644
--- a/components/search_engines/template_url.cc
+++ b/components/search_engines/template_url.cc
@@ -188,33 +188,29 @@ TemplateURLRef::SearchTermsArgs::ContextualSearchParams::
     : version(-1),
       start(base::string16::npos),
       end(base::string16::npos),
-      resolve(true) {
-}
+      now_on_tap_version(0) {}
 
-TemplateURLRef::SearchTermsArgs::ContextualSearchParams::
-    ContextualSearchParams(
-        const int version,
-        const std::string& selection,
-        const std::string& base_page_url,
-        const bool resolve)
+TemplateURLRef::SearchTermsArgs::ContextualSearchParams::ContextualSearchParams(
+    const int version,
+    const std::string& selection,
+    const std::string& base_page_url,
+    const int now_on_tap_version)
     : version(version),
       start(base::string16::npos),
       end(base::string16::npos),
       selection(selection),
       base_page_url(base_page_url),
-      resolve(resolve) {
-}
+      now_on_tap_version(now_on_tap_version) {}
 
-TemplateURLRef::SearchTermsArgs::ContextualSearchParams::
-    ContextualSearchParams(
-        const int version,
-        const size_t start,
-        const size_t end,
-        const std::string& selection,
-        const std::string& content,
-        const std::string& base_page_url,
-        const std::string& encoding,
-        const bool resolve)
+TemplateURLRef::SearchTermsArgs::ContextualSearchParams::ContextualSearchParams(
+    const int version,
+    const size_t start,
+    const size_t end,
+    const std::string& selection,
+    const std::string& content,
+    const std::string& base_page_url,
+    const std::string& encoding,
+    const int now_on_tap_version)
     : version(version),
       start(start),
       end(end),
@@ -222,8 +218,7 @@ TemplateURLRef::SearchTermsArgs::ContextualSearchParams::
       content(content),
       base_page_url(base_page_url),
       encoding(encoding),
-      resolve(resolve) {
-}
+      now_on_tap_version(now_on_tap_version) {}
 
 TemplateURLRef::SearchTermsArgs::ContextualSearchParams::ContextualSearchParams(
     const ContextualSearchParams& other) = default;
@@ -1020,8 +1015,9 @@ std::string TemplateURLRef::HandleReplacements(
           context_data.append("ctxs_encoding=" + params.encoding + "&");
         }
 
-        context_data.append(
-            params.resolve ? "ctxsl_resolve=1" : "ctxsl_resolve=0");

[Theresa, 2016/09/15 05:03:32]

Do we still need to append ctxsl_resolve=1 or does the server always resolve?

[Donn Denman, 2016/09/15 22:00:00]

Verified that it's not needed.  

Independently I realized the code here is a bit tricky, so I added a clarifying
comment.

+        std::string now_on_tap_version(
+            base::IntToString(params.now_on_tap_version));
+        context_data.append("ctxsl_coca=" + now_on_tap_version);
 
         HandleReplacement(std::string(), context_data, *i, &url);
         break;