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..85d2934842e20844abbc8cd31ab89225eeb2f868 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,21 @@ 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(
-      env, index,
-      base::android::ConvertUTF16ToJavaString(env, template_url->short_name()));
+  if (template_url->show_in_default_list())
+    return Java_TemplateUrl_create(

[Ian Wen, 2016/09/16 20:43:04]

You could say return Java_templateUrl_create(env, index, ...,
template_url->show_in_default_list()), and get rid of the if/else.

BTW, even if you use the if/else, you should wrap them in brackets.

[ltian, 2016/09/16 21:39:10]

Done.

+        env, index,
+        base::android::ConvertUTF16ToJavaString(env, template_url->short_name()),
+        true);
+  else
+    return Java_TemplateUrl_create(
+        env, index,
+        base::android::ConvertUTF16ToJavaString(env, template_url->short_name()),
+        false);
 }
 
 bool TemplateUrlServiceAndroid::IsPrepopulatedTemplate(TemplateURL* url) {