Rename EnhancedBookmarks to Bookmarks, part 1.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java
similarity index 89%
rename from chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkDelegate.java
rename to chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java
index fcdcf4582ec9bbe0484c83bcb6357e1ee89c5402..c420df3894d04bc245bac4337bc9a90c5ad06597 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.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.support.v4.widget.DrawerLayout;
 
@@ -16,12 +16,12 @@ import java.util.List;
  * Interface used by UI components in the main bookmarks UI to broadcast UI change notifications
  * and get bookmark data model.
  */
-interface EnhancedBookmarkDelegate {
+interface BookmarkDelegate {
 
     /**
      * Delegate used to open urls for main fragment on tablet.
      */
-    interface EnhancedBookmarkStateChangeListener {
+    interface BookmarkStateChangeListener {
         /**
          * Let the tab containing bookmark manager load the url and later handle UI updates.
          * @param url The url to open in tab.
@@ -53,7 +53,7 @@ interface EnhancedBookmarkDelegate {
      * that filter.
      * @param filter A filter that will narrow down a list of bookmarks to show.
      */
-    void openFilter(EnhancedBookmarkFilter filter);
+    void openFilter(BookmarkFilter filter);
 
     /**
      * Clear all selected items. After this call, {@link #isSelectionEnabled()} will return false.
@@ -86,7 +86,7 @@ interface EnhancedBookmarkDelegate {
      * Notifies the current mode set event to the given observer. For example, if the current mode
      * is MODE_ALL_BOOKMARKS, it calls onAllBookmarksModeSet.
      */
-    void notifyStateChange(EnhancedBookmarkUIObserver observer);
+    void notifyStateChange(BookmarkUIObserver observer);
 
     /**
      * @return Whether there is a drawer.
@@ -124,21 +124,21 @@ interface EnhancedBookmarkDelegate {
     /**
      * Add an observer to enhanced bookmark UI changes.
      */
-    void addUIObserver(EnhancedBookmarkUIObserver observer);
+    void addUIObserver(BookmarkUIObserver observer);
 
     /**
      * Remove an observer of enhanced bookmark UI changes.
      */
-    void removeUIObserver(EnhancedBookmarkUIObserver observer);
+    void removeUIObserver(BookmarkUIObserver observer);
 
     /**
      * @return Enhanced bookmark data model associated with this UI.
      */
-    EnhancedBookmarksModel getModel();
+    BookmarkModel getModel();
 
     /**
      * @return Current UIState of Enhanced Bookmark main UI. If no mode is stored,
-     *         {@link EnhancedBookmarkUIState#STATE_LOADING} is returned.
+     *         {@link BookmarkUIState#STATE_LOADING} is returned.
      */
     int getCurrentState();