Rename EnhancedBookmarks to Bookmarks, part 1.

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/enhancedbookmarks/EnhancedBookmarkUIState.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java
similarity index 73%
rename from chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUIState.java
rename to chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java
index 21557dd34f12262f5f50433f10557eb386f3b99c..bb2322af82b644eac9e72414895f2e44ff73c478 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUIState.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java
@@ -2,7 +2,7 @@
 // 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.enhancedbookmarks;
+package org.chromium.chrome.browser.bookmarks;
 
 import android.net.Uri;
 import android.text.TextUtils;
@@ -12,10 +12,10 @@ import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
 import org.chromium.components.bookmarks.BookmarkId;
 
 /**
- * A class representing the UI state of the {@link EnhancedBookmarkManager}. All
+ * A class representing the UI state of the {@link BookmarkManager}. All
  * states can be uniquely identified by a URL.
  */
-class EnhancedBookmarkUIState {
+class BookmarkUIState {
     static final String URI_PERSIST_QUERY_NAME = "persist";
 
     static final int STATE_LOADING = 1;
@@ -32,35 +32,34 @@ class EnhancedBookmarkUIState {
     /** Whether this state should be persisted as user's last location. */
     boolean mShouldPersist = true;
     BookmarkId mFolder;
-    EnhancedBookmarkFilter mFilter;
+    BookmarkFilter mFilter;
 
-    static EnhancedBookmarkUIState createLoadingState() {
-        EnhancedBookmarkUIState state = new EnhancedBookmarkUIState();
+    static BookmarkUIState createLoadingState() {
+        BookmarkUIState state = new BookmarkUIState();
         state.mState = STATE_LOADING;
         state.mShouldPersist = false;
         state.mUrl = "";
         return state;
     }
 
-    static EnhancedBookmarkUIState createAllBookmarksState(EnhancedBookmarksModel bookmarkModel) {
+    static BookmarkUIState createAllBookmarksState(BookmarkModel bookmarkModel) {
         return createStateFromUrl(Uri.parse(UrlConstants.BOOKMARKS_URL), bookmarkModel);
     }
 
-    static EnhancedBookmarkUIState createFolderState(BookmarkId folder,
-            EnhancedBookmarksModel bookmarkModel) {
+    static BookmarkUIState createFolderState(BookmarkId folder,
+            BookmarkModel bookmarkModel) {
         return createStateFromUrl(createFolderUrl(folder), bookmarkModel);
     }
 
-    static EnhancedBookmarkUIState createFilterState(
-            EnhancedBookmarkFilter filter, EnhancedBookmarksModel bookmarkModel) {
+    static BookmarkUIState createFilterState(
+            BookmarkFilter filter, BookmarkModel bookmarkModel) {
         return createStateFromUrl(createFilterUrl(filter, true), bookmarkModel);
     }
 
     /**
-     * @see #createStateFromUrl(Uri, EnhancedBookmarksModel)
+     * @see #createStateFromUrl(Uri, BookmarkModel)
      */
-    static EnhancedBookmarkUIState createStateFromUrl(String url,
-            EnhancedBookmarksModel bookmarkModel) {
+    static BookmarkUIState createStateFromUrl(String url, BookmarkModel bookmarkModel) {
         return createStateFromUrl(Uri.parse(url), bookmarkModel);
     }
 
@@ -68,9 +67,8 @@ class EnhancedBookmarkUIState {
      * @return A state corresponding to the URI object. If the URI is not valid,
      *         return all_bookmarks.
      */
-    static EnhancedBookmarkUIState createStateFromUrl(Uri uri,
-            EnhancedBookmarksModel bookmarkModel) {
-        EnhancedBookmarkUIState state = new EnhancedBookmarkUIState();
+    static BookmarkUIState createStateFromUrl(Uri uri, BookmarkModel bookmarkModel) {
+        BookmarkUIState state = new BookmarkUIState();
         state.mState = STATE_INVALID;
         state.mUrl = uri.toString();
         state.mShouldPersist = shouldPersist(uri);
@@ -87,7 +85,7 @@ class EnhancedBookmarkUIState {
             String path = uri.getLastPathSegment();
             if (!path.isEmpty()) {
                 state.mState = STATE_FILTER;
-                state.mFilter = EnhancedBookmarkFilter.valueOf(path);
+                state.mFilter = BookmarkFilter.valueOf(path);
             }
         }
 
@@ -103,7 +101,7 @@ class EnhancedBookmarkUIState {
         return createUrl(UrlConstants.BOOKMARKS_FOLDER_URL, folderId.toString(), true);
     }
 
-    static Uri createFilterUrl(EnhancedBookmarkFilter filter, boolean shouldPersist) {
+    static Uri createFilterUrl(BookmarkFilter filter, boolean shouldPersist) {
         return createUrl(UrlConstants.BOOKMARKS_FILTER_URL, filter.value, shouldPersist);
     }
 
@@ -127,7 +125,7 @@ class EnhancedBookmarkUIState {
         return !("0".equals(queryString));
     }
 
-    private EnhancedBookmarkUIState() {}
+    private BookmarkUIState() {}
 
     @Override
     public int hashCode() {
@@ -136,15 +134,15 @@ class EnhancedBookmarkUIState {
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof EnhancedBookmarkUIState)) return false;
-        EnhancedBookmarkUIState other = (EnhancedBookmarkUIState) obj;
+        if (!(obj instanceof BookmarkUIState)) return false;
+        BookmarkUIState other = (BookmarkUIState) obj;
         return mState == other.mState && TextUtils.equals(mUrl, other.mUrl);
     }
 
     /**
      * @return Whether this state is valid.
      */
-    boolean isValid(EnhancedBookmarksModel bookmarkModel) {
+    boolean isValid(BookmarkModel bookmarkModel) {
         if (mUrl == null || mState == STATE_INVALID) return false;
 
         if (mState == STATE_FOLDER) {
@@ -154,7 +152,7 @@ class EnhancedBookmarkUIState {
 
         if (mState == STATE_FILTER) {
             if (mFilter == null) return false;
-            if (mFilter == EnhancedBookmarkFilter.OFFLINE_PAGES) {
+            if (mFilter == BookmarkFilter.OFFLINE_PAGES) {
                 return OfflinePageBridge.isEnabled();
             }
         }