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..a2d28f2c986794fea29e3919b51203ee29d6dd31 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);
 }
 
@@ -122,15 +120,31 @@ jboolean TemplateUrlServiceAndroid::IsDefaultSearchEngineGoogle(
           template_url_service_->search_terms_data());
 }
 
+//function changes to retrieve not only the prepopulated search engines
+//but also the custom search engines which have been selected as default
+//search engine to adapt consistent design with desktop.

[Ian Wen, 2016/09/15 22:26:03]

Remove this comment?

In a jni bridge, function description should be written in java. Also I think
the code below is self descriptive enough that you don't need to add the
comment.

[ltian, 2016/09/16 00:23:18]

Done.

 base::android::ScopedJavaLocalRef<jobject>
 TemplateUrlServiceAndroid::GetPrepopulatedTemplateUrlAt(
     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>();
+  if(!template_url->show_in_default_list())
+    return ScopedJavaLocalRef<jobject>();
+
+  return Java_TemplateUrl_create(
+      env, index,
+      base::android::ConvertUTF16ToJavaString(env, template_url->short_name()));
+}
+
+base::android::ScopedJavaLocalRef<jobject>
+TemplateUrlServiceAndroid::GetRecentTemplateUrlAt(

[Ian Wen, 2016/09/15 22:26:03]

How would you use this method in Java? How would the java side know which index
in the GetTemplateURLs() is recent template urls?

I think what you need to do is change the method above to getTemplateUrlsAt(),
and in TemplateUrlService.java, you can create two java list that store the
prepopulated engines and recent engines. This means both types of engines will
be get from the same method, and it's your job to distinguish them in java.

[ltian, 2016/09/16 00:23:18]

That makes sense. I will change that part.

+    JNIEnv* env,
+    const JavaParamRef<jobject>& obj,
+    jint index){
+  TemplateURL* template_url = template_url_service_->GetTemplateURLs()[index];
+  if(template_url->show_in_default_list())
+    return ScopedJavaLocalRef<jobject>();
 
   return Java_TemplateUrl_create(
       env, index,