[Offline pages] Removing offline pages from Bookmarks UI

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

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java
index bb2322af82b644eac9e72414895f2e44ff73c478..ec8851c19b9ae701bfe25f90413af925441e513d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java
@@ -8,7 +8,6 @@ import android.net.Uri;
 import android.text.TextUtils;
 
 import org.chromium.chrome.browser.UrlConstants;
-import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
 import org.chromium.components.bookmarks.BookmarkId;
 
 /**
@@ -21,7 +20,6 @@ class BookmarkUIState {
     static final int STATE_LOADING = 1;
     static final int STATE_ALL_BOOKMARKS = 2;
     static final int STATE_FOLDER = 3;
-    static final int STATE_FILTER = 4;
     private static final int STATE_INVALID = 0;
 
     /**
@@ -29,15 +27,11 @@ class BookmarkUIState {
      */
     int mState;
     String mUrl;
-    /** Whether this state should be persisted as user's last location. */
-    boolean mShouldPersist = true;
     BookmarkId mFolder;
-    BookmarkFilter mFilter;
 
     static BookmarkUIState createLoadingState() {
         BookmarkUIState state = new BookmarkUIState();
         state.mState = STATE_LOADING;
-        state.mShouldPersist = false;
         state.mUrl = "";
         return state;
     }
@@ -51,11 +45,6 @@ class BookmarkUIState {
         return createStateFromUrl(createFolderUrl(folder), bookmarkModel);
     }
 
-    static BookmarkUIState createFilterState(
-            BookmarkFilter filter, BookmarkModel bookmarkModel) {
-        return createStateFromUrl(createFilterUrl(filter, true), bookmarkModel);
-    }
-
     /**
      * @see #createStateFromUrl(Uri, BookmarkModel)
      */
@@ -71,7 +60,6 @@ class BookmarkUIState {
         BookmarkUIState state = new BookmarkUIState();
         state.mState = STATE_INVALID;
         state.mUrl = uri.toString();
-        state.mShouldPersist = shouldPersist(uri);
 
         if (state.mUrl.equals(UrlConstants.BOOKMARKS_URL)) {
             state.mState = STATE_ALL_BOOKMARKS;
@@ -81,12 +69,6 @@ class BookmarkUIState {
                 state.mFolder = BookmarkId.getBookmarkIdFromString(path);
                 state.mState = STATE_FOLDER;
             }
-        } else if (state.mUrl.startsWith(UrlConstants.BOOKMARKS_FILTER_URL)) {
-            String path = uri.getLastPathSegment();
-            if (!path.isEmpty()) {
-                state.mState = STATE_FILTER;
-                state.mFilter = BookmarkFilter.valueOf(path);
-            }
         }
 
         if (!state.isValid(bookmarkModel)) {
@@ -98,33 +80,13 @@ class BookmarkUIState {
     }
 
     static Uri createFolderUrl(BookmarkId folderId) {
-        return createUrl(UrlConstants.BOOKMARKS_FOLDER_URL, folderId.toString(), true);
-    }
-
-    static Uri createFilterUrl(BookmarkFilter filter, boolean shouldPersist) {
-        return createUrl(UrlConstants.BOOKMARKS_FILTER_URL, filter.value, shouldPersist);
-    }
-
-    /**
-     * Encodes the path and appends it to the base url. A simple appending
-     * does not work because there might be spaces in suffix.
-     * @param shouldPersist Whether this url should be saved to preferences as
-     *                      user's last location.
-     */
-    private static Uri createUrl(String baseUrl, String pathSuffix, boolean shouldPersist) {
-        Uri.Builder builder = Uri.parse(baseUrl).buildUpon();
-        builder.appendPath(pathSuffix);
-        if (!shouldPersist) {
-            builder.appendQueryParameter(URI_PERSIST_QUERY_NAME, "0");
-        }
+        Uri.Builder builder = Uri.parse(UrlConstants.BOOKMARKS_FOLDER_URL).buildUpon();
+        // Encodes the path and appends it to the base url. A simple appending
+        // does not work because there might be spaces in suffix.
+        builder.appendPath(folderId.toString());
         return builder.build();
     }
 
-    private static boolean shouldPersist(Uri uri) {
-        String queryString = uri.getQueryParameter(URI_PERSIST_QUERY_NAME);
-        return !("0".equals(queryString));
-    }
-
     private BookmarkUIState() {}
 
     @Override
@@ -150,13 +112,6 @@ class BookmarkUIState {
                     && !mFolder.equals(bookmarkModel.getRootFolderId());
         }
 
-        if (mState == STATE_FILTER) {
-            if (mFilter == null) return false;
-            if (mFilter == BookmarkFilter.OFFLINE_PAGES) {
-                return OfflinePageBridge.isEnabled();
-            }
-        }
-
         return true;
     }
 }