Implement native functions to query custom search engines for Android

chrome/browser/search_engines/template_url_service_android.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/search_engines/template_url_service_android.h"
 
 #include <stddef.h>
 
 #include "base/android/jni_string.h"
 #include "base/bind.h"
@@ skipping 47 matching lines @@
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint selected_index) {
   std::vector<TemplateURL*> template_urls =
       template_url_service_->GetTemplateURLs();
   size_t selected_index_size_t = static_cast<size_t>(selected_index);
   DCHECK_LT(selected_index_size_t, template_urls.size()) <<
       "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);
 }
 
 jint TemplateUrlServiceAndroid::GetDefaultSearchProvider(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   std::vector<TemplateURL*> template_urls =
       template_url_service_->GetTemplateURLs();
   TemplateURL* default_search_provider =
       template_url_service_->GetDefaultSearchProvider();
@@ skipping 35 matching lines @@
 jboolean TemplateUrlServiceAndroid::IsDefaultSearchEngineGoogle(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   TemplateURL* default_search_provider =
       template_url_service_->GetDefaultSearchProvider();
   return default_search_provider &&
       default_search_provider->url_ref().HasGoogleBaseURLs(
           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,
       base::android::ConvertUTF16ToJavaString(env, template_url->short_name()));
 }
 
 bool TemplateUrlServiceAndroid::IsPrepopulatedTemplate(TemplateURL* url) {
   return url->prepopulate_id() > 0;
 }
 
 void TemplateUrlServiceAndroid::OnTemplateURLServiceLoaded() {
   template_url_subscription_.reset();
   JNIEnv* env = base::android::AttachCurrentThread();
@@ skipping 129 matching lines @@
 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   TemplateUrlServiceAndroid* template_url_service_android =
       new TemplateUrlServiceAndroid(env, obj);
   return reinterpret_cast<intptr_t>(template_url_service_android);
 }
 
 // static
 bool TemplateUrlServiceAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }