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..6563f7e0d9fe6723a26a201d775e14c8373f0bb8 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(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& obj,
-    jint index) {
+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(
       env, index,
-      base::android::ConvertUTF16ToJavaString(env, template_url->short_name()));
+      base::android::ConvertUTF16ToJavaString(env, template_url->short_name()),
+      IsPrepopulatedTemplate(template_url) ||
+          template_url->created_by_policy());
 }
 
 bool TemplateUrlServiceAndroid::IsPrepopulatedTemplate(TemplateURL* url) {