Rename EnhancedBookmarks to Bookmarks, part 2.

chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java
index 0df143d52521cc65e6576f1a75a82f137c66e572..3bc8e8b4fe6419aad460cad568472753f9a9fc1c 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java
@@ -39,7 +39,7 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.TimeoutException;
 
 /**
- * Tests for the enhanced bookmark manager.
+ * Tests for the bookmark manager.
  */
 public class BookmarkTest extends ChromeActivityTestCaseBase<ChromeActivity> {
 
@@ -106,7 +106,7 @@ public class BookmarkTest extends ChromeActivityTestCaseBase<ChromeActivity> {
         try {
             loadedCallback.waitForCallback(0);
         } catch (TimeoutException e) {
-            Assert.fail("Enhanced Bookmark model did not load: Timeout.");
+            Assert.fail("bookmark model did not load: Timeout.");
         }
     }
 
@@ -114,14 +114,14 @@ public class BookmarkTest extends ChromeActivityTestCaseBase<ChromeActivity> {
         if (DeviceFormFactor.isTablet(getActivity())) {
             loadUrl(UrlConstants.BOOKMARKS_URL);
             mItemsContainer = (BookmarkRecyclerView) getActivity().findViewById(
-                    R.id.eb_items_container);
+                    R.id.bookmark_items_container);
         } else {
             // phone
             BookmarkActivity activity = ActivityUtils.waitForActivity(getInstrumentation(),
                     BookmarkActivity.class, new MenuUtils.MenuActivityTrigger(
                             getInstrumentation(), getActivity(), R.id.all_bookmarks_menu_id));
             mItemsContainer = (BookmarkRecyclerView) activity.findViewById(
-                    R.id.eb_items_container);
+                    R.id.bookmark_items_container);
         }
     }
 
@@ -129,7 +129,7 @@ public class BookmarkTest extends ChromeActivityTestCaseBase<ChromeActivity> {
         if (DeviceFormFactor.isTablet(getActivity())) {
             loadUrl(url);
             mItemsContainer = (BookmarkRecyclerView) getActivity().findViewById(
-                    R.id.eb_items_container);
+                    R.id.bookmark_items_container);
         } else {
             // phone
             BookmarkActivity activity = ActivityUtils.waitForActivity(getInstrumentation(),
@@ -143,7 +143,7 @@ public class BookmarkTest extends ChromeActivityTestCaseBase<ChromeActivity> {
                         }
                     });
             mItemsContainer = (BookmarkRecyclerView) activity.findViewById(
-                    R.id.eb_items_container);
+                    R.id.bookmark_items_container);
         }
     }