Rename EnhancedBookmarks to Bookmarks, part 1.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkModel.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarksModel.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkModel.java
similarity index 94%
rename from chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarksModel.java
rename to chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkModel.java
index 31526d97e5202b22759d715ce9a77f3c10b5fc88..35f3a6e52af3d4b6223513db9d42a54c6470d4e9 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarksModel.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkModel.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;
 
@@ -34,7 +34,7 @@ import java.util.List;
  * icon fetching, reader mode url redirecting, etc. This class should serve as the single class for
  * the UI to acquire data from the backend.
  */
-public class EnhancedBookmarksModel extends BookmarksBridge {
+public class BookmarkModel extends BookmarksBridge {
     private static final int FAVICON_MAX_CACHE_SIZE = 10 * 1024 * 1024; // 10MB
 
     /**
@@ -58,7 +58,7 @@ public class EnhancedBookmarksModel extends BookmarksBridge {
      * which bookmarks were deleted. Note this observer only listens to events that go through
      * enhanced bookmark model.
      */
-    public interface EnhancedBookmarkDeleteObserver {
+    public interface BookmarkDeleteObserver {
 
         /**
          * Callback being triggered immediately before bookmarks are deleted.
@@ -83,7 +83,7 @@ public class EnhancedBookmarksModel extends BookmarksBridge {
                 }
             };
 
-    private ObserverList<EnhancedBookmarkDeleteObserver> mDeleteObservers = new ObserverList<>();
+    private ObserverList<BookmarkDeleteObserver> mDeleteObservers = new ObserverList<>();
     private OfflinePageBridge mOfflinePageBridge;
     private boolean mIsOfflinePageModelLoaded;
     private OfflinePageModelObserver mOfflinePageModelObserver;
@@ -91,12 +91,12 @@ public class EnhancedBookmarksModel extends BookmarksBridge {
     /**
      * Initialize enhanced bookmark model for last used non-incognito profile.
      */
-    public EnhancedBookmarksModel() {
+    public BookmarkModel() {
         this(Profile.getLastUsedProfile().getOriginalProfile());
     }
 
     @VisibleForTesting
-    public EnhancedBookmarksModel(Profile profile) {
+    public BookmarkModel(Profile profile) {
         super(profile);
 
         // Note: we check if mOfflinePageBridge is null after this to determine if offline pages
@@ -145,7 +145,7 @@ public class EnhancedBookmarksModel extends BookmarksBridge {
      * Add an observer that listens to delete events that go through enhanced bookmark model.
      * @param observer The observer to add.
      */
-    public void addDeleteObserver(EnhancedBookmarkDeleteObserver observer) {
+    public void addDeleteObserver(BookmarkDeleteObserver observer) {
         mDeleteObservers.addObserver(observer);
     }
 
@@ -153,7 +153,7 @@ public class EnhancedBookmarksModel extends BookmarksBridge {
      * Remove the observer from listening to bookmark deleting events.
      * @param observer The observer to remove.
      */
-    public void removeDeleteObserver(EnhancedBookmarkDeleteObserver observer) {
+    public void removeDeleteObserver(BookmarkDeleteObserver observer) {
         mDeleteObservers.removeObserver(observer);
     }
 
@@ -185,7 +185,7 @@ public class EnhancedBookmarksModel extends BookmarksBridge {
             endGroupingUndos();
         }
 
-        for (EnhancedBookmarkDeleteObserver observer : mDeleteObservers) {
+        for (BookmarkDeleteObserver observer : mDeleteObservers) {
             observer.onDeleteBookmarks(titles, isUndoable);
         }
     }
@@ -292,8 +292,8 @@ public class EnhancedBookmarksModel extends BookmarksBridge {
      * @param filter Filter to be applied to the bookmarks.
      * @return A list of bookmark IDs of bookmarks matching the filter.
      */
-    public List<BookmarkId> getBookmarkIDsByFilter(EnhancedBookmarkFilter filter) {
-        assert filter == EnhancedBookmarkFilter.OFFLINE_PAGES;
+    public List<BookmarkId> getBookmarkIDsByFilter(BookmarkFilter filter) {
+        assert filter == BookmarkFilter.OFFLINE_PAGES;
         assert mOfflinePageBridge != null;
 
         List<OfflinePageItem> offlinePages = mOfflinePageBridge.getAllPages();