Rename EnhancedBookmarks to Bookmarks, part 2.

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/bookmarks/BookmarkActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.java
index e44ee20f3d0ea215ffb94a6ffbf91adc96834fe4..96f078672d9412bc50744b227eb177dfabc180a2 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.java
@@ -19,7 +19,7 @@ import org.chromium.components.bookmarks.BookmarkId;
 /**
  * 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}).
+ * tablet the bookmark UI is shown inside of a tab (see {@link BookmarkPage}).
  */
 public class BookmarkActivity extends BookmarkActivityBase implements SnackbarManageable {
 
@@ -43,7 +43,7 @@ public class BookmarkActivity extends BookmarkActivityBase implements SnackbarMa
                 this, getString(OfflinePageUtils.getStringId(R.string.bookmarks)));
 
         // Hack to work around inferred theme false lint error: http://crbug.com/445633
-        assert (R.layout.eb_main_content != 0);
+        assert (R.layout.bookmark_main_content != 0);
     }
 
     @Override