Rename EnhancedBookmarks to Bookmarks, part 2.

chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkModelTest.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.test.UiThreadTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.ThreadUtils;
@@ skipping 12 matching lines @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Stack;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
- * Tests for {@link BookmarkModel}, the data layer of Enhanced Bookmarks.
+ * Tests for {@link BookmarkModel}, the data layer of bookmarks.
  */
 public class BookmarkModelTest extends NativeLibraryTestBase {
     private static final int TIMEOUT_MS = 5000;
     private BookmarkModel mBookmarkModel;
     private BookmarkId mMobileNode;
     private BookmarkId mOtherNode;
     private BookmarkId mDesktopNode;
 
     @Override
     protected void setUp() throws Exception {
@@ skipping 228 matching lines @@
         HashSet<BookmarkId> expectedIdsCopy = new HashSet<>(expectedIds);
         assertEquals(expectedIdsCopy.size(), listToVerify.size());
         for (BookmarkId id : listToVerify) {
             assertNotNull(id);
             assertTrue("List contains wrong element: ", expectedIdsCopy.contains(id));
             expectedIdsCopy.remove(id);
         }
         assertTrue("List does not contain some expected bookmarks: ", expectedIdsCopy.isEmpty());
     }
 }