Rename EnhancedBookmarks to Bookmarks, part 1.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.java
similarity index 76%
rename from chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActivity.java
rename to chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.java
index ef7dcbc546318bf0ba5aa162241acf6c1d45cd39..e44ee20f3d0ea215ffb94a6ffbf91adc96834fe4 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.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.Intent;
 import android.os.Bundle;
@@ -17,32 +17,29 @@ import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable;
 import org.chromium.components.bookmarks.BookmarkId;
 
 /**
- * The activity that wraps all enhanced bookmark UI on the phone. It keeps a
- * {@link EnhancedBookmarkManager} inside of it and creates a snackbar manager. This activity
- * should only be shown on phones; on tablet the enhanced bookmark UI is shown inside of a tab (see
- * {@link EnhancedBookmarkPage}).
+ * The activity that displays the bookmark UI on the phone. It keeps a {@link BookmarkManager}
+ * inside of it and creates a snackbar manager. This activity should only be shown on phones; on
+ * tablet the enhanced bookmark UI is shown inside of a tab (see {@link BookmarkPage}).
  */
-public class EnhancedBookmarkActivity extends EnhancedBookmarkActivityBase implements
-        SnackbarManageable {
+public class BookmarkActivity extends BookmarkActivityBase implements SnackbarManageable {
 
-    private EnhancedBookmarkManager mBookmarkManager;
+    private BookmarkManager mBookmarkManager;
     private SnackbarManager mSnackbarManager;
     static final int EDIT_BOOKMARK_REQUEST_CODE = 14;
-    public static final String INTENT_VISIT_BOOKMARK_ID =
-            "EnhancedBookmarkEditActivity.VisitBookmarkId";
+    public static final String INTENT_VISIT_BOOKMARK_ID = "BookmarkEditActivity.VisitBookmarkId";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
         mSnackbarManager = new SnackbarManager(getWindow());
-        mBookmarkManager = new EnhancedBookmarkManager(this, true);
+        mBookmarkManager = new BookmarkManager(this, true);
         String url = getIntent().getDataString();
         if (TextUtils.isEmpty(url)) url = UrlConstants.BOOKMARKS_URL;
         mBookmarkManager.updateForUrl(url);
 
         setContentView(mBookmarkManager.getView());
-        EnhancedBookmarkUtils.setTaskDescriptionInDocumentMode(
+        BookmarkUtils.setTaskDescriptionInDocumentMode(
                 this, getString(OfflinePageUtils.getStringId(R.string.bookmarks)));
 
         // Hack to work around inferred theme false lint error: http://crbug.com/445633