Rename EnhancedBookmarks to Bookmarks, part 1.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUndoController.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUndoController.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUndoController.java
similarity index 78%
rename from chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUndoController.java
rename to chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUndoController.java
index d8720c67840007f41401b4e87d8a518e4ebe206c..034fd89597dc3ec108d8312efafaec236df019db 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUndoController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUndoController.java
@@ -2,14 +2,14 @@
 // 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 org.chromium.chrome.R;
 import org.chromium.chrome.browser.bookmark.BookmarksBridge.BookmarkItem;
 import org.chromium.chrome.browser.bookmark.BookmarksBridge.BookmarkModelObserver;
-import org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarksModel.EnhancedBookmarkDeleteObserver;
+import org.chromium.chrome.browser.bookmarks.BookmarkModel.BookmarkDeleteObserver;
 import org.chromium.chrome.browser.snackbar.Snackbar;
 import org.chromium.chrome.browser.snackbar.SnackbarManager;
 
@@ -20,23 +20,23 @@ import java.util.Locale;
  * allowing them to undo their changes.
  * TODO(danduong): Add move undo
  */
-public class EnhancedBookmarkUndoController extends BookmarkModelObserver implements
-        SnackbarManager.SnackbarController, EnhancedBookmarkDeleteObserver {
+public class BookmarkUndoController extends BookmarkModelObserver implements
+        SnackbarManager.SnackbarController, BookmarkDeleteObserver {
 
-    private final EnhancedBookmarksModel mBookmarksModel;
+    private final BookmarkModel mBookmarkModel;
     private final SnackbarManager mSnackbarManager;
     private final Context mContext;
 
     /**
-     * Creates an instance of {@link EnhancedBookmarkUndoController}.
+     * Creates an instance of {@link BookmarkUndoController}.
      * @param context The {@link Context} in which snackbar is shown.
      * @param model The enhanced bookmark model.
      * @param snackbarManager SnackManager passed from activity.
      */
-    public EnhancedBookmarkUndoController(Context context, EnhancedBookmarksModel model,
+    public BookmarkUndoController(Context context, BookmarkModel model,
             SnackbarManager snackbarManager) {
-        mBookmarksModel = model;
-        mBookmarksModel.addDeleteObserver(this);
+        mBookmarkModel = model;
+        mBookmarkModel.addDeleteObserver(this);
         mSnackbarManager = snackbarManager;
         mContext = context;
     }
@@ -45,13 +45,13 @@ public class EnhancedBookmarkUndoController extends BookmarkModelObserver implem
      * Cleans up this class, unregistering for application notifications from bookmark model.
      */
     public void destroy() {
-        mBookmarksModel.removeDeleteObserver(this);
+        mBookmarkModel.removeDeleteObserver(this);
         mSnackbarManager.dismissSnackbars(this);
     }
 
     @Override
     public void onAction(Object actionData) {
-        mBookmarksModel.undo();
+        mBookmarkModel.undo();
         mSnackbarManager.dismissSnackbars(this);
     }
 
@@ -75,7 +75,7 @@ public class EnhancedBookmarkUndoController extends BookmarkModelObserver implem
         // Adding a new bookmark should not affect undo.
     }
 
-    // Implement EnhancedBookmarkDeleteObserver
+    // Implement BookmarkDeleteObserver
     @Override
     public void onDeleteBookmarks(String[] titles, boolean isUndoable) {
         assert titles != null && titles.length >= 1;