Rename EnhancedBookmarks to Bookmarks, part 1.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkRow.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkRow.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkRow.java
similarity index 90%
rename from chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkRow.java
rename to chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkRow.java
index 9ea1328bdf9d58cf2ef27acd924138bdd449e581..cf24ff251bd77edf1f99c826b22da1047c05861f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkRow.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkRow.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;
 import android.util.AttributeSet;
@@ -29,15 +29,15 @@ import java.util.List;
 /**
  * Common logic for bookmark and folder rows.
  */
-abstract class EnhancedBookmarkRow extends FrameLayout implements EnhancedBookmarkUIObserver,
+abstract class BookmarkRow extends FrameLayout implements BookmarkUIObserver,
         Checkable, OnClickListener, OnLongClickListener {
 
     protected ImageView mIconImageView;
     protected TextView mTitleView;
     protected TintedImageButton mMoreIcon;
-    private EnhancedBookmarkItemHighlightView mHighlightView;
+    private BookmarkItemHighlightView mHighlightView;
 
-    protected EnhancedBookmarkDelegate mDelegate;
+    protected BookmarkDelegate mDelegate;
     protected BookmarkId mBookmarkId;
     private ListPopupWindow mPopupMenu;
     private boolean mIsAttachedToWindow = false;
@@ -45,7 +45,7 @@ abstract class EnhancedBookmarkRow extends FrameLayout implements EnhancedBookma
     /**
      * Constructor for inflating from XML.
      */
-    public EnhancedBookmarkRow(Context context, AttributeSet attrs) {
+    public BookmarkRow(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
@@ -152,14 +152,14 @@ abstract class EnhancedBookmarkRow extends FrameLayout implements EnhancedBookma
                     } else if (position == 1) {
                         BookmarkItem item = mDelegate.getModel().getBookmarkById(mBookmarkId);
                         if (item.isFolder()) {
-                            EnhancedBookmarkAddEditFolderActivity.startEditFolderActivity(
+                            BookmarkAddEditFolderActivity.startEditFolderActivity(
                                     getContext(), item.getId());
                         } else {
-                            EnhancedBookmarkUtils.startEditActivity(
+                            BookmarkUtils.startEditActivity(
                                     getContext(), item.getId(), null);
                         }
                     } else if (position == 2) {
-                        EnhancedBookmarkFolderSelectActivity.startFolderSelectActivity(getContext(),
+                        BookmarkFolderSelectActivity.startFolderSelectActivity(getContext(),
                                 mBookmarkId);
                     } else if (position == 3) {
                         mDelegate.getModel().deleteBookmarks(mBookmarkId);
@@ -182,7 +182,7 @@ abstract class EnhancedBookmarkRow extends FrameLayout implements EnhancedBookma
         mTitleView = (TextView) findViewById(R.id.title);
 
         if (isSelectable()) {
-            mHighlightView = (EnhancedBookmarkItemHighlightView) findViewById(R.id.highlight);
+            mHighlightView = (BookmarkItemHighlightView) findViewById(R.id.highlight);
 
             mMoreIcon = (TintedImageButton) findViewById(R.id.more);
             mMoreIcon.setVisibility(VISIBLE);
@@ -252,10 +252,10 @@ abstract class EnhancedBookmarkRow extends FrameLayout implements EnhancedBookma
         mHighlightView.setChecked(checked);
     }
 
-    // EnhancedBookmarkUIObserver implementations.
+    // BookmarkUIObserver implementations.
 
     @Override
-    public void onEnhancedBookmarkDelegateInitialized(EnhancedBookmarkDelegate delegate) {
+    public void onBookmarkDelegateInitialized(BookmarkDelegate delegate) {
         assert mDelegate == null;
         mDelegate = delegate;
         if (mIsAttachedToWindow) initialize();
@@ -275,7 +275,7 @@ abstract class EnhancedBookmarkRow extends FrameLayout implements EnhancedBookma
     }
 
     @Override
-    public void onFilterStateSet(EnhancedBookmarkFilter filter) {
+    public void onFilterStateSet(BookmarkFilter filter) {
     }
 
     @Override