Bug 726810 - Kill BrowserDB.getAllBookmarks(). r=lucasr

mobile/android/base/db/AndroidBrowserDB.java

@@ -188,23 +188,6 @@ public class AndroidBrowserDB implements BrowserDB.BrowserDBIface {
         Browser.clearHistory(cr);
     }
 
-    public Cursor getAllBookmarks(ContentResolver cr) {
-        Cursor c = cr.query(Browser.BOOKMARKS_URI,
-                            new String[] { URL_COLUMN_ID,
-                                           BookmarkColumns.URL,
-                                           BookmarkColumns.TITLE,
-                                           BookmarkColumns.FAVICON },
-                            // Select all bookmarks with a non-empty URL. When the history
-                            // is empty there appears to be a dummy entry in the database
-                            // which has a title of "Bookmarks" and no URL; the length restriction
-                            // is to avoid picking that up specifically.
-                            Browser.BookmarkColumns.BOOKMARK + " = 1 AND LENGTH(" + Browser.BookmarkColumns.URL + ") > 0",
-                            null,
-                            Browser.BookmarkColumns.TITLE);
-
-        return new AndroidDBCursor(c);
-    }
-
     public Cursor getMobileBookmarks(ContentResolver cr) {
         Cursor c = cr.query(null, null, null, null, null);
         return new AndroidDBCursor(c);

mobile/android/base/db/BrowserDB.java

@@ -77,8 +77,6 @@ public class BrowserDB {
 
         public void clearHistory(ContentResolver cr);
 
-        public Cursor getAllBookmarks(ContentResolver cr);
-
         public Cursor getMobileBookmarks(ContentResolver cr);
 
         public Cursor getDesktopBookmarks(ContentResolver cr);
@@ -148,10 +146,6 @@ public class BrowserDB {
         sDb.clearHistory(cr);
     }
 
-    public static Cursor getAllBookmarks(ContentResolver cr) {
-        return sDb.getAllBookmarks(cr);
-    }
-
     public static Cursor getMobileBookmarks(ContentResolver cr) {
         return sDb.getMobileBookmarks(cr);
     }

mobile/android/base/db/LocalBrowserDB.java

@@ -287,20 +287,6 @@ public class LocalBrowserDB implements BrowserDB.BrowserDBIface {
         cr.delete(appendProfile(History.CONTENT_URI), null, null);
     }
 
-    public Cursor getAllBookmarks(ContentResolver cr) {
-        Cursor c = cr.query(appendProfile(Bookmarks.CONTENT_URI),
-                            new String[] { Bookmarks._ID,
-                                           Bookmarks.URL,
-                                           Bookmarks.TITLE,
-                                           Bookmarks.FAVICON,
-                                           Bookmarks.KEYWORD },
-                            Bookmarks.IS_FOLDER + " = 0",
-                            null,
-                            Bookmarks.TITLE + " ASC");
-
-        return new LocalDBCursor(c);
-    }
-
     public Cursor getMobileBookmarks(ContentResolver cr) {
         return getBookmarks(cr, true);
     }