Rename EnhancedBookmarks to Bookmarks, part 1.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkRecyclerView.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkRecyclerView.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkRecyclerView.java
similarity index 80%
rename from chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkRecyclerView.java
rename to chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkRecyclerView.java
index 3684a49a325ada045d6d98099dea6f1cb9afed54..bf70b74e559ac0fd3e22cdc2c452bdd2f8baedf9 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkRecyclerView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkRecyclerView.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.content.Context;
 import android.graphics.Rect;
@@ -20,10 +20,10 @@ import java.util.List;
 /**
  * Container for all bookmark items shown in enhanced bookmark manager.
  */
-public class EnhancedBookmarkRecyclerView extends RecyclerView implements
-        EnhancedBookmarkUIObserver {
+public class BookmarkRecyclerView extends RecyclerView implements
+        BookmarkUIObserver {
 
-    private EnhancedBookmarkDelegate mDelegate;
+    private BookmarkDelegate mDelegate;
     private View mEmptyView;
 
     /**
@@ -46,7 +46,7 @@ public class EnhancedBookmarkRecyclerView extends RecyclerView implements
     /**
      * Constructs a new instance of enhanced bookmark recycler view.
      */
-    public EnhancedBookmarkRecyclerView(Context context, AttributeSet attrs) {
+    public BookmarkRecyclerView(Context context, AttributeSet attrs) {
         super(context, attrs);
 
         setLayoutManager(new LinearLayoutManager(context));
@@ -89,8 +89,8 @@ public class EnhancedBookmarkRecyclerView extends RecyclerView implements
 
     @VisibleForTesting
     @Override
-    public EnhancedBookmarkItemsAdapter getAdapter() {
-        return (EnhancedBookmarkItemsAdapter) super.getAdapter();
+    public BookmarkItemsAdapter getAdapter() {
+        return (BookmarkItemsAdapter) super.getAdapter();
     }
 
     /**
@@ -101,15 +101,15 @@ public class EnhancedBookmarkRecyclerView extends RecyclerView implements
         mEmptyView.setVisibility(adapter.getItemCount() == 0 ? View.VISIBLE : View.GONE);
     }
 
-    // EnhancedBookmarkUIObserver implementations
+    // BookmarkUIObserver implementations
 
     @Override
-    public void onEnhancedBookmarkDelegateInitialized(EnhancedBookmarkDelegate delegate) {
+    public void onBookmarkDelegateInitialized(BookmarkDelegate delegate) {
         mDelegate = delegate;
         mDelegate.addUIObserver(this);
 
-        EnhancedBookmarkItemsAdapter adapter = new EnhancedBookmarkItemsAdapter(getContext());
-        adapter.onEnhancedBookmarkDelegateInitialized(mDelegate);
+        BookmarkItemsAdapter adapter = new BookmarkItemsAdapter(getContext());
+        adapter.onBookmarkDelegateInitialized(mDelegate);
         setAdapter(adapter);
     }
 
@@ -129,8 +129,8 @@ public class EnhancedBookmarkRecyclerView extends RecyclerView implements
     }
 
     @Override
-    public void onFilterStateSet(EnhancedBookmarkFilter filter) {
-        assert filter == EnhancedBookmarkFilter.OFFLINE_PAGES;
+    public void onFilterStateSet(BookmarkFilter filter) {
+        assert filter == BookmarkFilter.OFFLINE_PAGES;
         scrollToPosition(0);
     }
 
@@ -145,7 +145,7 @@ public class EnhancedBookmarkRecyclerView extends RecyclerView implements
     }
 
     @VisibleForTesting
-    public EnhancedBookmarkDelegate getDelegateForTesting() {
+    public BookmarkDelegate getDelegateForTesting() {
         return mDelegate;
     }
 }