Rename EnhancedBookmarks to Bookmarks, part 1.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDrawerListViewAdapter.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkDrawerListViewAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDrawerListViewAdapter.java
similarity index 91%
rename from chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkDrawerListViewAdapter.java
rename to chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDrawerListViewAdapter.java
index e7a30352c829416bf601e8cab061f868f3ebb77e..f006ca2106ee0b33824f58b5b79ad53b1d935db3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkDrawerListViewAdapter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDrawerListViewAdapter.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.view.LayoutInflater;
 import android.view.View;
@@ -21,9 +21,9 @@ import java.util.List;
 import java.util.Set;
 
 /**
- * BaseAdapter for EnhancedBookmarkDrawerListView. It manages items to list there.
+ * BaseAdapter for BookmarkDrawerListView. It manages items to list there.
  */
-class EnhancedBookmarkDrawerListViewAdapter extends BaseAdapter {
+class BookmarkDrawerListViewAdapter extends BaseAdapter {
     static final int TYPE_FOLDER = 0;
     static final int TYPE_ALL_ITEMS = -1;
     static final int TYPE_DIVIDER = -2;
@@ -34,7 +34,7 @@ class EnhancedBookmarkDrawerListViewAdapter extends BaseAdapter {
     static final int VIEW_TYPE_DIVIDER = 1;
     static final int VIEW_TYPE_TITLE = 2;
 
-    private EnhancedBookmarkDelegate mDelegate;
+    private BookmarkDelegate mDelegate;
     private List<Item> mTopSection = new ArrayList<Item>();
     private List<Item> mMiddleSection = new ArrayList<Item>();
     private List<Item> mBottomSection = new ArrayList<Item>();
@@ -52,7 +52,7 @@ class EnhancedBookmarkDrawerListViewAdapter extends BaseAdapter {
     static class Item {
         final int mType;
         final BookmarkId mFolderId;
-        final EnhancedBookmarkFilter mFilter;
+        final BookmarkFilter mFilter;
 
         Item(int itemType) {
             mType = itemType;
@@ -67,7 +67,7 @@ class EnhancedBookmarkDrawerListViewAdapter extends BaseAdapter {
             mFilter = null;
         }
 
-        Item(EnhancedBookmarkFilter filter) {
+        Item(BookmarkFilter filter) {
             assert filter != null;
             mType = TYPE_FILTER;
             mFolderId = null;
@@ -120,7 +120,7 @@ class EnhancedBookmarkDrawerListViewAdapter extends BaseAdapter {
             mTopSection.add(new Item(mOthersNodeId));
         }
         if (OfflinePageBridge.isEnabled()) {
-            mTopSection.add(new Item(EnhancedBookmarkFilter.OFFLINE_PAGES));
+            mTopSection.add(new Item(BookmarkFilter.OFFLINE_PAGES));
         }
 
         if (mManagedAndPartnerFolderIds != null) {
@@ -168,7 +168,7 @@ class EnhancedBookmarkDrawerListViewAdapter extends BaseAdapter {
         mBottomSection.clear();
     }
 
-    void setEnhancedBookmarkUIDelegate(EnhancedBookmarkDelegate delegate) {
+    void setEnhancedBookmarkUIDelegate(BookmarkDelegate delegate) {
         mDelegate = delegate;
     }
 
@@ -204,9 +204,9 @@ class EnhancedBookmarkDrawerListViewAdapter extends BaseAdapter {
      * Get item position of the given mode.
      */
     int getItemPosition(int state, Object modeDetail) {
-        if (state == EnhancedBookmarkUIState.STATE_ALL_BOOKMARKS) {
+        if (state == BookmarkUIState.STATE_ALL_BOOKMARKS) {
             return 0;
-        } else if (state == EnhancedBookmarkUIState.STATE_FOLDER) {
+        } else if (state == BookmarkUIState.STATE_FOLDER) {
             Set<BookmarkId> topLevelFolderParents = new HashSet<>();
             topLevelFolderParents.addAll(mDelegate.getModel().getTopLevelFolderParentIDs());
             topLevelFolderParents.add(mDesktopNodeId);
@@ -224,8 +224,8 @@ class EnhancedBookmarkDrawerListViewAdapter extends BaseAdapter {
                 topFolderId = parentId;
             }
             return positionOfBookmarkId(topFolderId);
-        } else if (state == EnhancedBookmarkUIState.STATE_FILTER) {
-            EnhancedBookmarkFilter filter = (EnhancedBookmarkFilter) modeDetail;
+        } else if (state == BookmarkUIState.STATE_FILTER) {
+            BookmarkFilter filter = (BookmarkFilter) modeDetail;
             return positionOfItem(new Item(filter));
         }
 
@@ -320,8 +320,8 @@ class EnhancedBookmarkDrawerListViewAdapter extends BaseAdapter {
             return convertView;
         }
 
-        final EnhancedBookmarkDrawerListItemView listItemView =
-                (EnhancedBookmarkDrawerListItemView) convertView;
+        final BookmarkDrawerListItemView listItemView =
+                (BookmarkDrawerListItemView) convertView;
         String title;
         int iconDrawableId;
 
@@ -345,7 +345,7 @@ class EnhancedBookmarkDrawerListViewAdapter extends BaseAdapter {
                 }
                 break;
             case TYPE_FILTER:
-                assert item.mFilter == EnhancedBookmarkFilter.OFFLINE_PAGES;
+                assert item.mFilter == BookmarkFilter.OFFLINE_PAGES;
                 title = listItemView.getContext().getResources().getString(
                         R.string.enhanced_bookmark_drawer_filter_offline_pages);
                 iconDrawableId = R.drawable.eb_filter_offline_pages;