Add Search Service in Enhanced Bookmark Bridge

chrome/android/java/src/org/chromium/chrome/browser/EnhancedBookmarksBridge.java

Index: chrome/android/java/src/org/chromium/chrome/browser/EnhancedBookmarksBridge.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/EnhancedBookmarksBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/EnhancedBookmarksBridge.java
index 20b930a6a5da660478b1ee618c7efe7bdb5e3c68..0d1bd736736d6583e2f8c70bd25e20b1d7e0dc7d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/EnhancedBookmarksBridge.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/EnhancedBookmarksBridge.java
@@ -20,8 +20,10 @@ import java.util.List;
 @JNINamespace("enhanced_bookmarks::android")
 public final class EnhancedBookmarksBridge {
     private long mNativeEnhancedBookmarksBridge;
-    private final ObserverList<FiltersObserver> mObservers =
+    private final ObserverList<FiltersObserver> mFilterObservers =
             new ObserverList<FiltersObserver>();
+    private final ObserverList<SearchServiceObserver> mSearchObservers =
+            new ObserverList<SearchServiceObserver>();
 
     /**
      * Interface to provide consumers notifications to changes in clusters
@@ -34,6 +36,17 @@ public final class EnhancedBookmarksBridge {
         void onFiltersChanged();
     }
 
+    /**
+     * Interface to provide consumers notifications to changes in search service results.
+     */
+    public interface SearchServiceObserver {
+        /**
+         * Invoked when client detects that search results have been updated. This callback is
+         * guaranteed to be called only once and only for the most reset query.

[lpromero, 2014/10/29 10:31:35]

s/most reset/most recent

[Ian Wen, 2014/10/29 21:54:35]

Done.

+         */
+        void onSearchResultReturned(String query, List<BookmarkId> results);

[lpromero, 2014/10/29 10:31:34]

s/onSearchResultReturned/onSearchResultsReturned since comments and parameters
always mention |results|.

[Ian Wen, 2014/10/29 21:54:35]

Done.

+    }
+
     public EnhancedBookmarksBridge(Profile profile) {
         mNativeEnhancedBookmarksBridge = nativeInit(profile);
     }
@@ -59,7 +72,7 @@ public final class EnhancedBookmarksBridge {
      * @param observer Observer to add
      */
     public void addFiltersObserver(FiltersObserver observer) {
-        mObservers.addObserver(observer);
+        mFilterObservers.addObserver(observer);
     }
 
     /**
@@ -67,7 +80,7 @@ public final class EnhancedBookmarksBridge {
      * @param observer Observer to remove
      */
     public void removeFiltersObserver(FiltersObserver observer) {
-        mObservers.removeObserver(observer);
+        mFilterObservers.removeObserver(observer);
     }
 
     /**
@@ -82,6 +95,30 @@ public final class EnhancedBookmarksBridge {
     }
 
     /**
+     * Send request to search server for querying related bookmarks.

[lpromero, 2014/10/29 10:31:35]

s/Send/Sends

[Ian Wen, 2014/10/29 21:54:35]

Done.

+     * @param query Keyword used to find related bookmarks.
+     */
+    public void sendSearchRequest(String query) {
+        nativeSendSearchRequest(mNativeEnhancedBookmarksBridge, query);
+    }
+
+    /**
+     * Registers a SearchObserver to listen for filter change notifications.

[lpromero, 2014/10/29 10:31:35]

Mentioning filters incorrectly here.

[Ian Wen, 2014/10/29 21:54:35]

Done.

+     * @param observer Observer to add
+     */
+    public void addSearchObserver(SearchServiceObserver observer) {
+        mSearchObservers.addObserver(observer);
+    }
+
+    /**
+     * Unregisters a SearchObserver from listening to filter change notifications.

[lpromero, 2014/10/29 10:31:35]

Ditto.

[Ian Wen, 2014/10/29 21:54:36]

Done.

+     * @param observer Observer to remove
+     */
+    public void removeSearchObserver(SearchServiceObserver observer) {
+        mSearchObservers.removeObserver(observer);
+    }
+
+    /**
      * @return Current set of known auto-filters for bookmarks.
      */
     public List<String> getFilters() {
@@ -92,12 +129,24 @@ public final class EnhancedBookmarksBridge {
 
     @CalledByNative
     private void onFiltersChanged() {
-        for (FiltersObserver observer : mObservers) {
+        for (FiltersObserver observer : mFilterObservers) {
             observer.onFiltersChanged();
         }
     }
 
     @CalledByNative
+    private void onSearchResultReturned(String query, List<BookmarkId> results) {
+        for (SearchServiceObserver observer : mSearchObservers) {
+            observer.onSearchResultReturned(query, results);
+        }
+    }
+
+    @CalledByNative
+    private static List<BookmarkId> createBookmarkIdList() {

[Kibeom Kim (inactive), 2014/10/29 07:51:47]

Let's move this function and below |addToBookmarkIdList| to BookmarkId.java ,
and also delete those two functions in BookmarksBridge.java to reduce
unnecessary code duplication.

+        return new ArrayList<BookmarkId>();
+    }
+
+    @CalledByNative
     private static void addToBookmarkIdList(List<BookmarkId> bookmarkIdList, long id, int type) {
         bookmarkIdList.add(new BookmarkId(id, type));
     }
@@ -111,4 +160,7 @@ public final class EnhancedBookmarksBridge {
     private native void nativeGetBookmarksForFilter(long nativeEnhancedBookmarksBridge,
             String filter, List<BookmarkId> list);
     private native String[] nativeGetFilters(long nativeEnhancedBookmarksBridge);
+    private native void nativeGetSearchResults(long nativeEnhancedBookmarksBridge,

[lpromero, 2014/10/29 10:31:34]

Seems unused.

[Ian Wen, 2014/10/29 21:54:36]

Done.

+            List<BookmarkId> list, String query);
+    private native void nativeSendSearchRequest(long nativeEnhancedBookmarksBridge, String query);
 }