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

components/search_engines/template_url.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/search_engines/template_url.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 170 matching lines @@
     default;
 
 TemplateURLRef::SearchTermsArgs::~SearchTermsArgs() {
 }
 
 TemplateURLRef::SearchTermsArgs::ContextualSearchParams::
     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),
       selection(selection),
       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;
 
 TemplateURLRef::SearchTermsArgs::ContextualSearchParams::
     ~ContextualSearchParams() {
 }
 
 // TemplateURLRef -------------------------------------------------------------
 
@@ skipping 776 matching lines @@
         if (!params.content.empty())
           context_data.append("ctxs_content=" + params.content + "&");
 
         if (!params.base_page_url.empty())
           context_data.append("ctxsl_url=" + params.base_page_url + "&");
 
         if (!params.encoding.empty()) {
           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;
       }
 
       case GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION:
         DCHECK(!i->is_post_param);
         if (search_terms_args.accepted_suggestion >= 0 ||
             !search_terms_args.assisted_query_stats.empty()) {
           HandleReplacement(
@@ skipping 518 matching lines @@
       // patterns. This means that given patterns
       //    [ "http://foo/#q={searchTerms}", "http://foo/?q={searchTerms}" ],
       // calling ExtractSearchTermsFromURL() on "http://foo/?q=bar#q=' would
       // return false. This is important for at least Google, where such URLs
       // are invalid.
       return !search_terms->empty();
     }
   }
   return false;
 }