Rename EnhancedBookmarks to Bookmarks, part 2.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // 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.bookmarks;
 
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Environment;
 import android.test.suitebuilder.annotation.SmallTest;
@@ skipping 21 matching lines @@
 import org.chromium.content.browser.test.util.CallbackHelper;
 import org.chromium.content.browser.test.util.TouchCommon;
 import org.chromium.net.test.EmbeddedTestServer;
 import org.chromium.ui.base.DeviceFormFactor;
 
 import java.util.ArrayList;
 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> {
 
     public BookmarkTest() {
         super(ChromeActivity.class);
         mSkipCheckHttpServer = true;
     }
 
     private static final String TEST_PAGE = "/chrome/test/data/android/google.html";
     private static final String TEST_PAGE_TITLE = "The Google";
@@ skipping 46 matching lines @@
                             loadedCallback.notifyCalled();
                             mBookmarkModel.removeObserver(this);
                         }
                     });
                 }
             }
         });
         try {
             loadedCallback.waitForCallback(0);
         } catch (TimeoutException e) {
-            Assert.fail("Enhanced Bookmark model did not load: Timeout.");
+            Assert.fail("bookmark model did not load: Timeout.");
         }
     }
 
     private void openBookmarkManager() throws InterruptedException {
         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);
         }
     }
 
     private void openBookmarkManager(final String url) throws InterruptedException {
         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(),
                     BookmarkActivity.class, new Runnable() {
                         @Override
                         public void run() {
                             Intent intent = new Intent(getActivity(),
                                     BookmarkActivity.class);
                             intent.setData(Uri.parse(url));
                             getActivity().startActivity(intent);
                         }
                     });
             mItemsContainer = (BookmarkRecyclerView) activity.findViewById(
-                    R.id.eb_items_container);
+                    R.id.bookmark_items_container);
         }
     }
 
     private boolean isItemPresentInBookmarkList(final String expectedTitle) {
         return ThreadUtils.runOnUiThreadBlockingNoException(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
                 for (int i = 0; i < mItemsContainer.getAdapter().getItemCount(); i++) {
                     BookmarkId item = mItemsContainer.getAdapter().getItem(i);
                     if (item == null) continue;
@@ skipping 132 matching lines @@
                     if (TextUtils.equals(((TextView) v).getText().toString(), expectedText)) {
                         matchingViews.add(v);
                     }
                 }
                 Assert.assertEquals("Exactly one item should be present.", 1, matchingViews.size());
                 return matchingViews.get(0);
             }
         });
     }
 }