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 36 matching lines @@
     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());
 }
 
 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) {
   return url->prepopulate_id() > 0;
 }
 
 void TemplateUrlServiceAndroid::OnTemplateURLServiceLoaded() {
   template_url_subscription_.reset();
   JNIEnv* env = base::android::AttachCurrentThread();
   if (weak_java_obj_.get(env).is_null())
@@ skipping 128 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);
 }