Rename EnhancedBookmarks to Bookmarks, part 1.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIObserver.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUIObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIObserver.java
similarity index 57%
rename from chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUIObserver.java
rename to chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIObserver.java
index 8375892ddc2254fb093cce44d529d46c71b829d2..c20a3d370bed9c34c819c163485c8370be34b292 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUIObserver.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIObserver.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 org.chromium.components.bookmarks.BookmarkId;
 
@@ -13,8 +13,8 @@ import java.util.List;
  * event that affects UI. All enhanced bookmark UI components are expected to implement this and
  * update themselves correctly on each event.
  */
-interface EnhancedBookmarkUIObserver {
-    void onEnhancedBookmarkDelegateInitialized(EnhancedBookmarkDelegate delegate);
+interface BookmarkUIObserver {
+    void onBookmarkDelegateInitialized(BookmarkDelegate delegate);
 
     /**
      * Called when the entire UI is being destroyed and will be no longer in use.
@@ -22,25 +22,25 @@ interface EnhancedBookmarkUIObserver {
     void onDestroy();
 
     /**
-     * @see EnhancedBookmarkDelegate#openAllBookmarks()
+     * @see BookmarkDelegate#openAllBookmarks()
      */
     void onAllBookmarksStateSet();
 
     /**
-     * @see EnhancedBookmarkDelegate#openFolder(BookmarkId)
+     * @see BookmarkDelegate#openFolder(BookmarkId)
      */
     void onFolderStateSet(BookmarkId folder);
 
     /**
-     * @see EnhancedBookmarkDelegate#openFilter(EnhancedBookmarkFilter)
+     * @see BookmarkDelegate#openFilter(BookmarkFilter)
      */
-    void onFilterStateSet(EnhancedBookmarkFilter filter);
+    void onFilterStateSet(BookmarkFilter filter);
 
     /**
      * Please refer to
-     * {@link EnhancedBookmarkDelegate#toggleSelectionForBookmark(BookmarkId)},
-     * {@link EnhancedBookmarkDelegate#clearSelection()} and
-     * {@link EnhancedBookmarkDelegate#getSelectedBookmarks()}
+     * {@link BookmarkDelegate#toggleSelectionForBookmark(BookmarkId)},
+     * {@link BookmarkDelegate#clearSelection()} and
+     * {@link BookmarkDelegate#getSelectedBookmarks()}
      */
     void onSelectionStateChange(List<BookmarkId> selectedBookmarks);
 }