Added android Template URL support for voice search.

chrome/browser/search_engines/template_url_service_android.cc

Index: chrome/browser/search_engines/template_url_service_android.cc
diff --git a/chrome/browser/search_engines/template_url_service_android.cc b/chrome/browser/search_engines/template_url_service_android.cc
index a60fe362eca449afdbd5d888109c2c5676db1eef..b28a3f3811875ee45e80c4707553187693eab68c 100644
--- a/chrome/browser/search_engines/template_url_service_android.cc
+++ b/chrome/browser/search_engines/template_url_service_android.cc
@@ -10,12 +10,16 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/google/google_util.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 "chrome/browser/search_engines/util.h"
 #include "jni/TemplateUrlService_jni.h"
+#include "net/base/url_util.h"
 
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertUTF16ToJavaString;
@@ -155,6 +159,23 @@ TemplateUrlServiceAndroid::GetUrlForSearchQuery(JNIEnv* env,
 }
 
 base::android::ScopedJavaLocalRef<jstring>
+TemplateUrlServiceAndroid::GetUrlForVoiceSearchQuery(JNIEnv* env,
+                                                     jobject obj,
+                                                     jstring jquery) {
+  base::string16 query(ConvertJavaStringToUTF16(env, jquery));
+  std::string url;
+
+  if (!query.empty()) {
+    GURL gurl = GetDefaultSearchURLForSearchTerms(GetOriginalProfile(), query);
+    if (google_util::IsGoogleSearchUrl(gurl))
+      gurl = net::AppendQueryParameter(gurl, "inm", "vs");
+    url = gurl.spec();
+  }
+
+  return ConvertUTF8ToJavaString(env, url);
+}
+
+base::android::ScopedJavaLocalRef<jstring>
 TemplateUrlServiceAndroid::ReplaceSearchTermsInUrl(JNIEnv* env,
                                                    jobject obj,
                                                    jstring jquery,