Rename EnhancedBookmarks to Bookmarks, part 1.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkPage.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java
similarity index 84%
rename from chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkPage.java
rename to chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java
index 342209c7c07de3d2e07af341d2dc176888025c34..6084b97ff4d270cbe39e809fb5f4e3fae1ad1d2c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkPage.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.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.app.Activity;
 import android.content.res.Resources;
@@ -13,21 +13,21 @@ import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.NativePage;
 import org.chromium.chrome.browser.UrlConstants;
-import org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarkDelegate.EnhancedBookmarkStateChangeListener;
+import org.chromium.chrome.browser.bookmarks.BookmarkDelegate.BookmarkStateChangeListener;
 import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.content_public.browser.LoadUrlParams;
 
 /**
- * A native page holding a {@link EnhancedBookmarkManager} on _tablet_.
+ * A native page holding a {@link BookmarkManager} on _tablet_.
  */
-public class EnhancedBookmarkPage implements NativePage, EnhancedBookmarkStateChangeListener {
+public class BookmarkPage implements NativePage, BookmarkStateChangeListener {
     private final Activity mActivity;
     private final Tab mTab;
     private final String mTitle;
     private final int mBackgroundColor;
     private final int mThemeColor;
-    private EnhancedBookmarkManager mManager;
+    private BookmarkManager mManager;
     private String mCurrentUrl;
 
     /**
@@ -35,7 +35,7 @@ public class EnhancedBookmarkPage implements NativePage, EnhancedBookmarkStateCh
      * @param activity The activity to get context and manage fragments.
      * @param tab The tab to load urls.
      */
-    public EnhancedBookmarkPage(Activity activity, Tab tab) {
+    public BookmarkPage(Activity activity, Tab tab) {
         mActivity = activity;
         mTab = tab;
         mTitle = activity.getString(OfflinePageUtils.getStringId(R.string.bookmarks));
@@ -44,7 +44,7 @@ public class EnhancedBookmarkPage implements NativePage, EnhancedBookmarkStateCh
         mThemeColor = ApiCompatibilityUtils.getColor(
                 activity.getResources(), R.color.default_primary_color);
 
-        mManager = new EnhancedBookmarkManager(mActivity, false);
+        mManager = new BookmarkManager(mActivity, false);
         Resources res = mActivity.getResources();
 
         MarginLayoutParams layoutParams = new MarginLayoutParams(