[Contextual Search] Update GetUrlForContextualSearchQuery.

chrome/browser/search_engines/template_url_service_android.cc

 // Copyright (c) 2013 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/search_engines/template_url_service_android.h"
 
 #include <stddef.h>
 
 #include "base/android/jni_string.h"
 #include "base/bind.h"
@@ skipping 211 matching lines @@
   }
   return base::android::ScopedJavaLocalRef<jstring>(env, NULL);
 }
 
 base::android::ScopedJavaLocalRef<jstring>
 TemplateUrlServiceAndroid::GetUrlForContextualSearchQuery(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jstring>& jquery,
     const JavaParamRef<jstring>& jalternate_term,
-    jboolean jshould_prefetch) {
+    jboolean jshould_prefetch,
+    const JavaParamRef<jstring>& jprotocol_version) {
   base::string16 query(base::android::ConvertJavaStringToUTF16(env, jquery));
   std::string url;
 
   if (!query.empty()) {
     GURL gurl(GetDefaultSearchURLForSearchTerms(template_url_service_, query));
     if (google_util::IsGoogleSearchUrl(gurl)) {
-      gurl = net::AppendQueryParameter(gurl, "ctxs", "2");
+      std::string protocol_version(
+          base::android::ConvertJavaStringToUTF8(env, jprotocol_version));
+      gurl = net::AppendQueryParameter(gurl, "ctxs", protocol_version);
       if (jshould_prefetch) {
         // Indicate that the search page is being prefetched.
         gurl = net::AppendQueryParameter(gurl, "pf", "c");
       }
 
       if (jalternate_term) {
         std::string alternate_term(
             base::android::ConvertJavaStringToUTF8(env, jalternate_term));
         if (!alternate_term.empty()) {
           gurl = net::AppendQueryParameter(
@@ skipping 22 matching lines @@
 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   TemplateUrlServiceAndroid* template_url_service_android =
       new TemplateUrlServiceAndroid(env, obj);
   return reinterpret_cast<intptr_t>(template_url_service_android);
 }
 
 // static
 bool TemplateUrlServiceAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }