Implement native functions to query custom search engines for Android

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 c18a4ec5d58172a1d1fcf0aad4f5a5b434fe5b6a..0135b532f4bd7538da1d687f2c8e69fa47a4807b 100644
--- a/chrome/browser/search_engines/template_url_service_android.cc
+++ b/chrome/browser/search_engines/template_url_service_android.cc
@@ -65,8 +65,6 @@ void TemplateUrlServiceAndroid::SetUserSelectedDefaultSearchProvider(
       "Wrong index for search engine";
 
   TemplateURL* template_url = template_urls[selected_index_size_t];
-  DCHECK_GT(template_url->prepopulate_id(), 0) <<
-      "Tried to select non-prepopulated search engine";
   template_url_service_->SetUserSelectedDefaultSearchProvider(template_url);
 }
 
@@ -123,18 +121,15 @@ jboolean TemplateUrlServiceAndroid::IsDefaultSearchEngineGoogle(
 }
 
 base::android::ScopedJavaLocalRef<jobject>
-TemplateUrlServiceAndroid::GetPrepopulatedTemplateUrlAt(
+TemplateUrlServiceAndroid::GetTemplateUrlAt(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint index) {
   TemplateURL* template_url = template_url_service_->GetTemplateURLs()[index];
-  if (!IsPrepopulatedTemplate(template_url) &&
-      !template_url->created_by_policy())
-   return ScopedJavaLocalRef<jobject>();
-
   return Java_TemplateUrl_create(

[Ian Wen, 2016/09/16 21:54:06]

I think you don't need to check the policy anymore. If you want to be extra
safe, you might check extension and filter them out. However on Android this is
not feasible.

IMO, in #132 you only need to check IsPrepopulatedTemplate().

Also, #129 to #132 are not properly formatted. Try to run git cl format before
submitting.

[ltian, 2016/09/16 22:14:09]

Done.

-      env, index,
-      base::android::ConvertUTF16ToJavaString(env, template_url->short_name()));
+        env, index,
+        base::android::ConvertUTF16ToJavaString(env, template_url->short_name()),
+        IsPrepopulatedTemplate(template_url) || template_url->created_by_policy());
 }
 
 bool TemplateUrlServiceAndroid::IsPrepopulatedTemplate(TemplateURL* url) {