[Android] Make BookmarksBridge#getSubFolders function more flexible.

chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.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;
 
 import android.text.TextUtils;
 import android.util.Log;
 
 import org.chromium.base.CalledByNative;
@@ skipping 171 matching lines @@
      * @return All the permanent nodes.
      */
     public List<BookmarkId> getPermanentNodeIDs() {
         assert mIsNativeBookmarkModelLoaded;
         List<BookmarkId> result = new ArrayList<BookmarkId>();
         nativeGetPermanentNodeIDs(mNativeBookmarksBridge, result);
         return result;
     }
 
     /**
-     * @return Sub-folders of the given folder.
+     * Reads sub-folder IDs, sub-bookmark IDs, or both of the given folder.
+     *
+     * @param getFolders   Whether sub-folders should be returned.
+     * @param getBookmarks Whether sub-bookmarks should be returned.
+     * @return Child IDs of the given folder, with the specified type.
      */
-    public List<BookmarkId> getSubFolders(BookmarkId id) {
+    public List<BookmarkId> getChildIDs(BookmarkId id, boolean getFolders, boolean getBookmarks) {
         assert mIsNativeBookmarkModelLoaded;
         List<BookmarkId> result = new ArrayList<BookmarkId>();
-        nativeGetChildIDs(mNativeBookmarksBridge, id.mId, id.mType, true, false, result);
+        nativeGetChildIDs(mNativeBookmarksBridge,
+                id.mId,
+                id.mType,
+                getFolders,
+                getBookmarks,
+                result);
         return result;
     }
 
     /**
      * @return All bookmark IDs ordered by creation date.
      */
     public List<BookmarkId> getAllBookmarkIDsOrderedByCreationDate() {
         assert mIsNativeBookmarkModelLoaded;
         List<BookmarkId> result = new ArrayList<BookmarkId>();
         nativeGetAllBookmarkIDsOrderedByCreationDate(mNativeBookmarksBridge, result);
@@ skipping 407 matching lines @@
                 case GET_CURRENT_FOLDER_HIERARCHY:
                     mHandler.getCurrentFolderHierarchy(mFolderId, mCallback);
                     break;
                 default:
                     assert false;
                     break;
             }
         }
     }
 }