[Contextual Search] Update GetUrlForContextualSearchQuery.

chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java

Index: chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java b/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java
index dad707fdc6d2b2a2618ab69e89aa30442b682ad1..4f348d2b91ad1f423d164c412c0e90fd05be0343 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java
@@ -282,14 +282,15 @@ public class TemplateUrlService {
      * @param query The search term to use as the main query in the returned search url.
      * @param alternateTerm The alternate search term to use as an alternate suggestion.
      * @param shouldPrefetch Whether the returned url should include a prefetch parameter.
+     * @param protocolVersion The version of the Contextual Search API protocol to use.

[newt (away), 2016/02/09 21:17:01]

Except for tests, we only pass in a single value for protocolVersion: "2". Does
this need to be configurable via a parameter?

[Donn Denman, 2016/02/09 21:41:50]

Yes, we're in transition to a "Single-Request" model, so we'll be sending both
"2" and "3" until we're fully transitioned.  It's a big change so I'm trying to
land these prerequisites separately.

      * @return      A {@link String} that contains the url of the default search engine with
      *              {@code query} and {@code alternateTerm} inserted as parameters and contextual
      *              search and prefetch parameters conditionally set.
      */
-    public String getUrlForContextualSearchQuery(String query, String alternateTerm,
-            boolean shouldPrefetch) {
-        return nativeGetUrlForContextualSearchQuery(
-            mNativeTemplateUrlServiceAndroid, query, alternateTerm, shouldPrefetch);
+    public String getUrlForContextualSearchQuery(
+            String query, String alternateTerm, boolean shouldPrefetch, String protocolVersion) {
+        return nativeGetUrlForContextualSearchQuery(mNativeTemplateUrlServiceAndroid, query,
+                alternateTerm, shouldPrefetch, protocolVersion);
     }
 
     /**
@@ -320,7 +321,7 @@ public class TemplateUrlService {
     private native String nativeReplaceSearchTermsInUrl(long nativeTemplateUrlServiceAndroid,
             String query, String currentUrl);
     private native String nativeGetUrlForContextualSearchQuery(long nativeTemplateUrlServiceAndroid,
-            String query, String alternateTerm, boolean shouldPrefetch);
+            String query, String alternateTerm, boolean shouldPrefetch, String protocolVersion);
     private native String nativeGetSearchEngineUrlFromTemplateUrl(
             long nativeTemplateUrlServiceAndroid, int index);
 }