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

components/search_engines/template_url.h

 // 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.
 
 #ifndef COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_H_
 #define COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 68 matching lines @@
 
     struct ContextualSearchParams {
       ContextualSearchParams();
       // Used when the content is sent in the HTTP header instead of as CGI
       // parameters.
       // TODO(donnd): Remove base_page_url and selection parameters once
       // they are logged from the HTTP header.
       ContextualSearchParams(const int version,
                              const std::string& selection,
                              const std::string& base_page_url,
-                             const bool resolve);
+                             const int now_on_tap_version);
       // TODO(donnd): Delete constructor once Clank, iOS, and tests no
       // longer depend on it.
       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);
+                             const int now_on_tap_version);
       ContextualSearchParams(const ContextualSearchParams& other);
       ~ContextualSearchParams();
 
       // The version of contextual search.
       int version;
 
       // Offset into the page content of the start of the user selection.
       size_t start;
 
       // Offset into the page content of the end of the user selection.
       size_t end;
 
       // The user selection.
       std::string selection;
 
       // The text including and surrounding the user selection.
       std::string content;
 
       // The URL of the page containing the user selection.
       std::string base_page_url;
 
       // 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.
+      int now_on_tap_version;
     };
 
     // The search terms (query).
     base::string16 search_terms;
 
     // The original (input) query.
     base::string16 original_query;
 
     // The type the original input query was identified as.
     metrics::OmniboxInputType::Type input_type;
@@ skipping 619 matching lines @@
 
   // Caches the computed engine type across successive calls to GetEngineType().
   mutable SearchEngineType engine_type_;
 
   // TODO(sky): Add date last parsed OSD file.
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURL);
 };
 
 #endif  // COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_H_