Implement native functions to query custom search engines for Android

chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java

Index: chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java b/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java
index 4f348d2b91ad1f423d164c412c0e90fd05be0343..923eb4659d99ddac667597f64ca5b245b2099b9c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java
@@ -47,16 +47,18 @@ public class TemplateUrlService {
     public static class TemplateUrl {
         private final int mIndex;
         private final String mShortName;
+        private boolean mIsPrepopulated;
 
         @CalledByNative("TemplateUrl")
         public static TemplateUrl create(
-                int id, String shortName) {
-            return new TemplateUrl(id, shortName);
+                int id, String shortName, boolean isPrepopulated) {

[Ian Wen, 2016/09/16 21:54:06]

nit: move #54 to #53 (if possible)

[ltian, 2016/09/16 22:14:09]

Done.

+            return new TemplateUrl(id, shortName, isPrepopulated);
         }
 
-        public TemplateUrl(int index, String shortName) {
+        public TemplateUrl(int index, String shortName, boolean isPrepopulated) {
             mIndex = index;
             mShortName = shortName;
+            mIsPrepopulated = isPrepopulated;
         }
 
         public int getIndex() {
@@ -128,9 +130,9 @@ public class TemplateUrlService {
         int templateUrlCount = nativeGetTemplateUrlCount(mNativeTemplateUrlServiceAndroid);
         List<TemplateUrl> templateUrls = new ArrayList<TemplateUrl>(templateUrlCount);
         for (int i = 0; i < templateUrlCount; i++) {
-            TemplateUrl templateUrl = nativeGetPrepopulatedTemplateUrlAt(
+            TemplateUrl templateUrl = nativeGetTemplateUrlAt(
                     mNativeTemplateUrlServiceAndroid, i);
-            if (templateUrl != null) {
+            if (templateUrl != null && templateUrl.mIsPrepopulated) {
                 templateUrls.add(templateUrl);
             }
         }
@@ -176,7 +178,7 @@ public class TemplateUrlService {
         assert defaultSearchEngineIndex < nativeGetTemplateUrlCount(
                 mNativeTemplateUrlServiceAndroid);
 
-        return nativeGetPrepopulatedTemplateUrlAt(
+        return nativeGetTemplateUrlAt(
                 mNativeTemplateUrlServiceAndroid, defaultSearchEngineIndex);
     }
 
@@ -306,8 +308,7 @@ public class TemplateUrlService {
     private native void nativeLoad(long nativeTemplateUrlServiceAndroid);
     private native boolean nativeIsLoaded(long nativeTemplateUrlServiceAndroid);
     private native int nativeGetTemplateUrlCount(long nativeTemplateUrlServiceAndroid);
-    private native TemplateUrl nativeGetPrepopulatedTemplateUrlAt(
-            long nativeTemplateUrlServiceAndroid, int i);
+    private native TemplateUrl nativeGetTemplateUrlAt(long nativeTemplateUrlServiceAndroid, int i);
     private native void nativeSetUserSelectedDefaultSearchProvider(
             long nativeTemplateUrlServiceAndroid, int selectedIndex);
     private native int nativeGetDefaultSearchProvider(long nativeTemplateUrlServiceAndroid);