Rename EnhancedBookmarks to Bookmarks, part 1.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFolderRow.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkFolderRow.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFolderRow.java
similarity index 82%
rename from chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkFolderRow.java
rename to chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFolderRow.java
index a8ccaa2cdaf2efc893741cebded3d51a7799432d..73b438766e8b3533ac8adaf265844cd47f3c6187 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkFolderRow.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFolderRow.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;
@@ -15,12 +15,12 @@ import org.chromium.components.bookmarks.BookmarkId;
 /**
  * A row view that shows folder info in the enhanced bookmarks UI.
  */
-public class EnhancedBookmarkFolderRow extends EnhancedBookmarkRow {
+public class BookmarkFolderRow extends BookmarkRow {
 
     /**
      * Constructor for inflating from XML.
      */
-    public EnhancedBookmarkFolderRow(Context context, AttributeSet attrs) {
+    public BookmarkFolderRow(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
@@ -31,7 +31,7 @@ public class EnhancedBookmarkFolderRow extends EnhancedBookmarkRow {
                 TintedDrawable.constructTintedDrawable(getResources(), R.drawable.eb_folder));
     }
 
-    // EnhancedBookmarkRow implementation.
+    // BookmarkRow implementation.
 
     @Override
     public void onClick() {