Add ctxsl_alternate_term to the contextual search request and update the API version to 2.

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 "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_prepopulate_data.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/search_engines/util.h"
 #include "jni/TemplateUrlService_jni.h"
 #include "net/base/url_util.h"
 
 using base::android::ConvertJavaStringToUTF16;
+using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;

[Peter Kasting, 2014/08/13 02:04:16]

Nit: Avoid using statements unless they significantly improve code readability
(I'd remove all these)

[jeremycho, 2014/08/13 20:29:27]

Done.

 
 namespace {
 
 Profile* GetOriginalProfile() {
   return ProfileManager::GetActiveUserProfile()->GetOriginalProfile();
 }
 
 }  // namespace
 
 TemplateUrlServiceAndroid::TemplateUrlServiceAndroid(JNIEnv* env,
@@ skipping 162 matching lines @@
     if (refined_query)
       return ConvertUTF8ToJavaString(env, destination_url.spec());
   }
   return base::android::ScopedJavaLocalRef<jstring>(env, NULL);
 }
 
 base::android::ScopedJavaLocalRef<jstring>
 TemplateUrlServiceAndroid::GetUrlForContextualSearchQuery(JNIEnv* env,
                                                           jobject obj,
                                                           jstring jquery) {
+  return GetUrlForContextualSearchQuery(env, obj, jquery, NULL);
+}
+
+base::android::ScopedJavaLocalRef<jstring>
+TemplateUrlServiceAndroid::GetUrlForContextualSearchQuery(
+    JNIEnv* env, jobject obj, jstring jquery, jstring jalternate_term) {

[Peter Kasting, 2014/08/13 02:04:16]

Nit: One arg per line

[jeremycho, 2014/08/13 20:29:27]

Done.

   base::string16 query(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", "1");
+      gurl = net::AppendQueryParameter(gurl, "ctxs", "2");
       // Indicate that the search page is being prefetched.
       gurl = net::AppendQueryParameter(gurl, "pf", "c");
+
+      if (jalternate_term) {
+        std::string alternate_term(
+            ConvertJavaStringToUTF8(env, jalternate_term));

[Peter Kasting, 2014/08/13 02:04:15]

Nit: Is it safe to run this if !jalternate_term?  Because if so it seems like
the conditional below would catch that case.

[jeremycho, 2014/08/13 20:29:27]

A null is being passed from Java, so I think having the check is good to avoid a
warning from ConvertJavaStringToUTF8.

+        if (!alternate_term.empty()) {
+          gurl = net::AppendQueryParameter(
+              gurl, "ctxsl_alternate_term", alternate_term);
+        }
+      }
     }
     url = gurl.spec();
   }
 
   return ConvertUTF8ToJavaString(env, url);
 }
 
 static jlong Init(JNIEnv* env, 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);
 }