Expose the ability to perform a search from CVC.

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/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "content/public/browser/notification_source.h"
 #include "jni/TemplateUrlService_jni.h"
 
+using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertUTF16ToJavaString;
+using base::android::ConvertUTF8ToJavaString;
 
 namespace {
 
 Profile* GetOriginalProfile() {
   return g_browser_process->profile_manager()->GetDefaultProfile()->
       GetOriginalProfile();
 }
 
 }  // namespace
 
@@ skipping 98 matching lines @@
       env,
       index,
       ConvertUTF16ToJavaString(env, template_url->short_name()).obj(),
       ConvertUTF16ToJavaString(env, template_url->keyword()).obj());
 }
 
 bool TemplateUrlServiceAndroid::IsPrepopulatedTemplate(TemplateURL* url) {
   return url->prepopulate_id() > 0;
 }
 
+static jstring GetUrlForSearchQuery(JNIEnv* env, jclass, jstring jquery) {

[Ted C, 2013/09/10 16:05:06]

here and below, I thought chrome was against name less params even if unused. 
maybe I'm wrong though.

[David Trainor- moved to gerrit, 2013/09/10 22:35:46]

Done.

+  Profile* profile = g_browser_process->profile_manager()->GetDefaultProfile();
+  const TemplateURL* default_provider =
+      TemplateURLServiceFactory::GetForProfile(profile)->

[Yaron, 2013/09/10 16:31:46]

You already have a template_url_service_ member. Make this a member fn and use
that.

[David Trainor- moved to gerrit, 2013/09/10 22:35:46]

Done.

+          GetDefaultSearchProvider();
+
+  string16 query(ConvertJavaStringToUTF16(env, jquery));
+
+  std::string url;
+  if (default_provider &&
+      default_provider->url_ref().SupportsReplacement() && !query.empty()) {
+    url = default_provider->url_ref().ReplaceSearchTerms(
+        TemplateURLRef::SearchTermsArgs(query));
+  }
+
+  // OK to release, JNI binding.
+  return ConvertUTF8ToJavaString(env, url).Release();
+}
+
+static jstring ReplaceSearchTermsInUrl(JNIEnv* env,
+                                jclass,

[Ted C, 2013/09/10 16:05:06]

alignment is off

[David Trainor- moved to gerrit, 2013/09/10 22:35:46]

Done.

+                                jstring jquery,
+                                jstring jcurrent_url) {
+  Profile* profile = g_browser_process->profile_manager()->GetDefaultProfile();

[Yaron, 2013/09/10 16:31:46]

same here

[David Trainor- moved to gerrit, 2013/09/10 22:35:46]

Done.

+  TemplateURL* default_provider =
+      TemplateURLServiceFactory::GetForProfile(profile)->
+          GetDefaultSearchProvider();
+
+  string16 query(ConvertJavaStringToUTF16(env, jquery));
+  GURL current_url(ConvertJavaStringToUTF16(env, jcurrent_url));
+  GURL destination_url(current_url);
+  if (default_provider && !query.empty()) {
+    bool refinedQuery = default_provider->ReplaceSearchTermsInURL(current_url,

[Yaron, 2013/09/10 16:31:46]

refined_query

[David Trainor- moved to gerrit, 2013/09/10 22:35:46]

Moving methods wholesale ftl :(.  Sorry.

+        TemplateURLRef::SearchTermsArgs(query), &destination_url);
+    if (refinedQuery) {

[Ted C, 2013/09/10 16:05:06]

no braces needed

[David Trainor- moved to gerrit, 2013/09/10 22:35:46]

Done.

+      return ConvertUTF8ToJavaString(env, destination_url.spec()).Release();
+    }
+  }
+  return NULL;
+}
+
 static jint Init(JNIEnv* env, jobject obj) {
   TemplateUrlServiceAndroid* template_url_service_android =
       new TemplateUrlServiceAndroid(env, obj);
   return reinterpret_cast<jint>(template_url_service_android);
 }
 
 // static
 bool TemplateUrlServiceAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }