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

components/search_engines/template_url.h

Index: components/search_engines/template_url.h
diff --git a/components/search_engines/template_url.h b/components/search_engines/template_url.h
index 16c79ea9f9d349463e9a4d3a884f6ef0d3a79c20..4481dc3c4c52d2cddcecced5370551fa644e5113 100644
--- a/components/search_engines/template_url.h
+++ b/components/search_engines/template_url.h
@@ -86,7 +86,7 @@ class TemplateURLRef {
       ContextualSearchParams(const int version,
                              const std::string& selection,
                              const std::string& base_page_url,
-                             const bool resolve);
+                             const int now_on_tap_version);

[Peter Kasting, 2016/09/15 23:05:41]

Nit: Don't mark parameters passed by value as const (there is very little
utility in this) -- can you fix the several cases that are here?

[Donn Denman, 2016/09/15 23:34:25]

Done.

       // TODO(donnd): Delete constructor once Clank, iOS, and tests no
       // longer depend on it.
       ContextualSearchParams(const int version,
@@ -96,7 +96,7 @@ class TemplateURLRef {
                              const std::string& content,
                              const std::string& base_page_url,
                              const std::string& encoding,
-                             const bool resolve);
+                             const int now_on_tap_version);
       ContextualSearchParams(const ContextualSearchParams& other);
       ~ContextualSearchParams();
 
@@ -121,10 +121,9 @@ class TemplateURLRef {
       // The encoding of content.
       std::string encoding;
 
-      // If true, the server will generate a search term based on the user
-      // selection and context.  Otherwise the user selection will be used as-is
-      // as the search term.
-      bool resolve;
+      // The version of Now on Tap data to request.  A value of 0 indicates no
+      // data needed, a value > 0 indicates the version of the data to return.

[Peter Kasting, 2016/09/15 23:05:41]

Nit: I might just remove the whole last clause here as it seems redundant.

[Donn Denman, 2016/09/15 23:34:25]

Done.

+      int now_on_tap_version;
     };
 
     // The search terms (query).