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

chrome/browser/android/contextualsearch/contextual_search_delegate.cc

 // Copyright 2015 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 "chrome/browser/android/contextualsearch/contextual_search_delegate.h"
 
 #include <algorithm>
 
 #include "base/base64.h"
 #include "base/command_line.h"
@@ skipping 37 matching lines @@
 const char kContextualSearchServerEndpoint[] = "_/contextualsearch?";
 const int kContextualSearchRequestVersion = 2;
 const int kContextualSearchMaxSelection = 100;
 const char kXssiEscape[] = ")]}'\n";
 const char kDiscourseContextHeaderPrefix[] = "X-Additional-Discourse-Context: ";
 const char kDoPreventPreloadValue[] = "1";
 
 // The number of characters that should be shown after the selected expression.
 const int kSurroundingSizeForUI = 60;
 
+// The version of the Now on Tap API that we want to invoke;

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

nit: replace the semi-colon with a period

[Donn Denman, 2016/09/15 21:59:59]

Done.

+const int kNowOnTapVersion = 1;
+
 } // namespace
 
 // URLFetcher ID, only used for tests: we only have one kind of fetcher.
 const int ContextualSearchDelegate::kContextualSearchURLFetcherID = 1;
 
 // Handles tasks for the ContextualSearchManager in a separable, testable way.
 ContextualSearchDelegate::ContextualSearchDelegate(
     net::URLRequestContextGetter* url_request_context,
     TemplateURLService* template_url_service,
     const ContextualSearchDelegate::SearchTermResolutionCallback&
@@ skipping 132 matching lines @@
       !template_url_service_->GetDefaultSearchProvider()) {
     return std::string();
   }
 
   std::string selected_text(net::EscapeQueryParamValue(selection, true));
   TemplateURL* template_url = template_url_service_->GetDefaultSearchProvider();
 
   TemplateURLRef::SearchTermsArgs search_terms_args =
       TemplateURLRef::SearchTermsArgs(base::string16());
 
+  int now_on_tap_version =
+      field_trial_->IsNowOnTapBarIntegrationEnabled() ? kNowOnTapVersion : 0;
+
   TemplateURLRef::SearchTermsArgs::ContextualSearchParams params(
-      kContextualSearchRequestVersion, selected_text, "", true);
+      kContextualSearchRequestVersion, selected_text, "", now_on_tap_version);
 
   search_terms_args.contextual_search_params = params;
 
   std::string request(
       template_url->contextual_search_url_ref().ReplaceSearchTerms(
           search_terms_args,
           template_url_service_->search_terms_data(),
           NULL));
 
   // The switch/param should be the URL up to and including the endpoint.
@@ skipping 304 matching lines @@
     end_offset -= trim;
   }
   if (result_text.length() > end_offset + padding_each_side_pinned) {
     // Trim the end.
     result_text = result_text.substr(0, end_offset + padding_each_side_pinned);
   }
   *start = start_offset;
   *end = end_offset;
   return result_text;
 }