Add a template url accessor for contextual search that doesn't prefetch.

BUG=416225

Review URL: https://codereview.chromium.org/601003002

Cr-Commit-Position: refs/heads/master@{#296629}

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

@@ -223,27 +223,35 @@ public class TemplateUrlService {
         return nativeReplaceSearchTermsInUrl(mNativeTemplateUrlServiceAndroid, query, url);
     }
 
-    // TODO(jeremycho): Delete once Clank no longer references it.
+    // TODO(donnd): Delete once the client no longer references it.
     /**
      * Finds the default search engine for the default provider and returns the url query
      * {@link String} for {@code query} with the contextual search version param set.
+     * @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.
      * @return      A {@link String} that contains the url of the default search engine with
-     *              {@code query} inserted as the search parameter and contextual search param set.
+     *              {@code query} and {@code alternateTerm} inserted as parameters and contextual
+     *              search and prefetch parameters set.
      */
-    public String getUrlForContextualSearchQuery(String query) {
-        return nativeGetUrlForContextualSearchQuery(mNativeTemplateUrlServiceAndroid, query, null);
+     public String getUrlForContextualSearchQuery(String query, String alternateTerm) {
+        return nativeGetUrlForContextualSearchQuery(
+            mNativeTemplateUrlServiceAndroid, query, alternateTerm, true);
     }
 
     /**
      * Finds the default search engine for the default provider and returns the url query
      * {@link String} for {@code query} with the contextual search version param set.
+     * @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.
      * @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 param set.
+     *              search and prefetch parameters conditionally set.
      */
-    public String getUrlForContextualSearchQuery(String query, String alternateTerm) {
+     public String getUrlForContextualSearchQuery(String query, String alternateTerm,
+            boolean shouldPrefetch) {
         return nativeGetUrlForContextualSearchQuery(
-            mNativeTemplateUrlServiceAndroid, query, alternateTerm);
+            mNativeTemplateUrlServiceAndroid, query, alternateTerm, shouldPrefetch);
     }
 
     private native long nativeInit();
@@ -265,5 +273,5 @@ public class TemplateUrlService {
     private native String nativeReplaceSearchTermsInUrl(long nativeTemplateUrlServiceAndroid,
             String query, String currentUrl);
     private native String nativeGetUrlForContextualSearchQuery(long nativeTemplateUrlServiceAndroid,
-            String query, String alternateTerm);
+            String query, String alternateTerm, boolean shouldPrefetch);
 }

chrome/browser/search_engines/template_url_service_android.cc

@@ -204,7 +204,8 @@ TemplateUrlServiceAndroid::GetUrlForContextualSearchQuery(
     JNIEnv* env,
     jobject obj,
     jstring jquery,
-    jstring jalternate_term) {
+    jstring jalternate_term,
+    jboolean jshould_prefetch) {
   base::string16 query(base::android::ConvertJavaStringToUTF16(env, jquery));
   std::string url;
 
@@ -212,8 +213,10 @@ TemplateUrlServiceAndroid::GetUrlForContextualSearchQuery(
     GURL gurl(GetDefaultSearchURLForSearchTerms(template_url_service_, query));
     if (google_util::IsGoogleSearchUrl(gurl)) {
       gurl = net::AppendQueryParameter(gurl, "ctxs", "2");
-      // Indicate that the search page is being prefetched.
-      gurl = net::AppendQueryParameter(gurl, "pf", "c");
+      if (jshould_prefetch) {
+        // Indicate that the search page is being prefetched.
+        gurl = net::AppendQueryParameter(gurl, "pf", "c");
+      }
 
       if (jalternate_term) {
         std::string alternate_term(

chrome/browser/search_engines/template_url_service_android.h

@@ -49,7 +49,8 @@ class TemplateUrlServiceAndroid {
       JNIEnv* env,
       jobject obj,
       jstring jquery,
-      jstring jalternate_term);
+      jstring jalternate_term,
+      jboolean jshould_prefetch);
 
   static bool Register(JNIEnv* env);