[Bookmarks] Refactor search view to use SelectableListLayout paradigm

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java

 // Copyright 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.
 
 package org.chromium.chrome.browser.bookmarks;
 
 import android.text.TextUtils;
 import android.util.Pair;
 
 import org.chromium.base.ObserverList;
@@ skipping 463 matching lines @@
     public BookmarkId getChildAt(BookmarkId folderId, int index) {
         assert mIsNativeBookmarkModelLoaded;
         return nativeGetChildAt(mNativeBookmarkBridge, folderId.getId(), folderId.getType(),
                 index);
     }
 
     /**
      * Synchronously gets a list of bookmarks that match the specified search query.
      * @param query Keyword used for searching bookmarks.
      * @param maxNumberOfResult Maximum number of result to fetch.
-     * @return List of bookmarks that are related to the given query.
+     * @return List of bookmark IDs that are related to the given query.
      */
-    public List<BookmarkMatch> searchBookmarks(String query, int maxNumberOfResult) {
-        List<BookmarkMatch> bookmarkMatches = new ArrayList<BookmarkMatch>();
+    public List<BookmarkId> searchBookmarks(String query, int maxNumberOfResult) {
+        List<BookmarkId> bookmarkMatches = new ArrayList<BookmarkId>();
         nativeSearchBookmarks(mNativeBookmarkBridge, bookmarkMatches, query,
                 maxNumberOfResult);
         return bookmarkMatches;
     }
 
 
     /**
      * Set title of the given bookmark.
      */
     public void setBookmarkTitle(BookmarkId id, String title) {
@@ skipping 305 matching lines @@
         bookmarkIdList.add(new BookmarkId(id, type));
     }
 
     @CalledByNative
     private static void addToBookmarkIdListWithDepth(List<BookmarkId> folderList, long id,
             int type, List<Integer> depthList, int depth) {
         folderList.add(new BookmarkId(id, type));
         depthList.add(depth);
     }
 
-    @CalledByNative
-    private static void addToBookmarkMatchList(List<BookmarkMatch> bookmarkMatchList,
-            long id, int type, int[] titleMatchStartPositions,
-            int[] titleMatchEndPositions, int[] urlMatchStartPositions,
-            int[] urlMatchEndPositions) {
-        bookmarkMatchList.add(new BookmarkMatch(new BookmarkId(id, type),
-                createPairsList(titleMatchStartPositions, titleMatchEndPositions),
-                createPairsList(urlMatchStartPositions, urlMatchEndPositions)));
-    }
-
     private static List<Pair<Integer, Integer>> createPairsList(int[] left, int[] right) {
         List<Pair<Integer, Integer>> pairList = new ArrayList<Pair<Integer, Integer>>();
         for (int i = 0; i < left.length; i++) {
             pairList.add(new Pair<Integer, Integer>(left[i], right[i]));
         }
         return pairList;
     }
 
     /**
      * Details about callbacks that need to be called once the bookmark model has loaded.
@@ skipping 71 matching lines @@
     private native void nativeRemoveAllUserBookmarks(long nativeBookmarkBridge);
     private native void nativeMoveBookmark(long nativeBookmarkBridge, BookmarkId bookmarkId,
             BookmarkId newParentId, int index);
     private native BookmarkId nativeAddBookmark(long nativeBookmarkBridge, BookmarkId parent,
             int index, String title, String url);
     private native void nativeUndo(long nativeBookmarkBridge);
     private native void nativeStartGroupingUndos(long nativeBookmarkBridge);
     private native void nativeEndGroupingUndos(long nativeBookmarkBridge);
     private native void nativeLoadEmptyPartnerBookmarkShimForTesting(long nativeBookmarkBridge);
     private native void nativeSearchBookmarks(long nativeBookmarkBridge,
-            List<BookmarkMatch> bookmarkMatches, String query, int maxNumber);
+            List<BookmarkId> bookmarkMatches, String query, int maxNumber);
     private native long nativeInit(Profile profile);
     private native boolean nativeIsDoingExtensiveChanges(long nativeBookmarkBridge);
     private native void nativeDestroy(long nativeBookmarkBridge);
     private static native boolean nativeIsEditBookmarksEnabled(long nativeBookmarkBridge);
 }