Rename EnhancedBookmarks to Bookmarks, part 1.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActionBar.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
similarity index 91%
rename from chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActionBar.java
rename to chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
index 3e783782e1c13b6e792768918d86655daaeb1335..f85da8a8b9d23898be8e978cee770d454fd06692 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActionBar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.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.Context;
@@ -30,7 +30,7 @@ import java.util.List;
  * Main action bar of Enhanced Bookmark UI. It is responsible for displaying title and buttons
  * associated with the current context.
  */
-public class EnhancedBookmarkActionBar extends Toolbar implements EnhancedBookmarkUIObserver,
+public class BookmarkActionBar extends Toolbar implements BookmarkUIObserver,
         OnMenuItemClickListener, OnClickListener {
     private static final int NAVIGATION_BUTTON_NONE = 0;
     private static final int NAVIGATION_BUTTON_MENU = 1;
@@ -39,7 +39,7 @@ public class EnhancedBookmarkActionBar extends Toolbar implements EnhancedBookma
 
     private int mNavigationButton;
     private BookmarkItem mCurrentFolder;
-    private EnhancedBookmarkDelegate mDelegate;
+    private BookmarkDelegate mDelegate;
     private ActionBarDrawerToggle mActionBarDrawerToggle;
     private boolean mIsSelectionEnabled;
 
@@ -50,7 +50,7 @@ public class EnhancedBookmarkActionBar extends Toolbar implements EnhancedBookma
         }
     };
 
-    public EnhancedBookmarkActionBar(Context context, AttributeSet attrs) {
+    public BookmarkActionBar(Context context, AttributeSet attrs) {
         super(context, attrs);
         setNavigationOnClickListener(this);
         inflateMenu(R.menu.eb_action_bar_menu);
@@ -94,11 +94,11 @@ public class EnhancedBookmarkActionBar extends Toolbar implements EnhancedBookma
     @Override
     public boolean onMenuItemClick(MenuItem menuItem) {
         if (menuItem.getItemId() == R.id.edit_menu_id) {
-            EnhancedBookmarkAddEditFolderActivity.startEditFolderActivity(getContext(),
+            BookmarkAddEditFolderActivity.startEditFolderActivity(getContext(),
                     mCurrentFolder.getId());
             return true;
         } else if (menuItem.getItemId() == R.id.close_menu_id) {
-            EnhancedBookmarkUtils.finishActivityOnPhone(getContext());
+            BookmarkUtils.finishActivityOnPhone(getContext());
             return true;
         } else if (menuItem.getItemId() == R.id.search_menu_id) {
             mDelegate.openSearchUI();
@@ -108,16 +108,15 @@ public class EnhancedBookmarkActionBar extends Toolbar implements EnhancedBookma
             assert list.size() == 1;
             BookmarkItem item = mDelegate.getModel().getBookmarkById(list.get(0));
             if (item.isFolder()) {
-                EnhancedBookmarkAddEditFolderActivity.startEditFolderActivity(getContext(),
-                        item.getId());
+                BookmarkAddEditFolderActivity.startEditFolderActivity(getContext(), item.getId());
             } else {
-                EnhancedBookmarkUtils.startEditActivity(getContext(), item.getId(), null);
+                BookmarkUtils.startEditActivity(getContext(), item.getId(), null);
             }
             return true;
         } else if (menuItem.getItemId() == R.id.selection_mode_move_menu_id) {
             List<BookmarkId> list = mDelegate.getSelectedBookmarks();
             if (list.size() >= 1) {
-                EnhancedBookmarkFolderSelectActivity.startFolderSelectActivity(getContext(),
+                BookmarkFolderSelectActivity.startFolderSelectActivity(getContext(),
                         list.toArray(new BookmarkId[list.size()]));
             }
             return true;
@@ -202,10 +201,10 @@ public class EnhancedBookmarkActionBar extends Toolbar implements EnhancedBookma
         getMenu().findItem(R.id.edit_menu_id).setVisible(false);
     }
 
-    // EnhancedBookmarkUIObserver implementations.
+    // BookmarkUIObserver implementations.
 
     @Override
-    public void onEnhancedBookmarkDelegateInitialized(EnhancedBookmarkDelegate delegate) {
+    public void onBookmarkDelegateInitialized(BookmarkDelegate delegate) {
         mDelegate = delegate;
         mDelegate.addUIObserver(this);
         if (!delegate.isDialogUi()) getMenu().removeItem(R.id.close_menu_id);
@@ -249,8 +248,8 @@ public class EnhancedBookmarkActionBar extends Toolbar implements EnhancedBookma
     }
 
     @Override
-    public void onFilterStateSet(EnhancedBookmarkFilter filter) {
-        assert filter == EnhancedBookmarkFilter.OFFLINE_PAGES;
+    public void onFilterStateSet(BookmarkFilter filter) {
+        assert filter == BookmarkFilter.OFFLINE_PAGES;
         setTitle(R.string.enhanced_bookmark_title_bar_filter_offline_pages);
         setNavigationButton(NAVIGATION_BUTTON_MENU);
         getMenu().findItem(R.id.edit_menu_id).setVisible(false);