[Offline pages] Removing offline pages from Bookmarks UI

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;
 import org.chromium.base.annotations.SuppressFBWarnings;
-import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
-import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem;
-import org.chromium.chrome.browser.bookmarks.BookmarkModel.AddBookmarkCallback;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.test.util.BookmarkTestUtil;
 import org.chromium.components.bookmarks.BookmarkId;
 import org.chromium.content.browser.test.NativeLibraryTestBase;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Stack;
@@ skipping 174 matching lines @@
         BookmarkId folderC = mBookmarkModel.addFolder(mMobileNode, 0, "fc");
         verifyBookmark(folderC, "fc", null, true, mMobileNode);
 
         BookmarkId bookmarkAA = addBookmark(folderA, 0, "aa", "http://aa.com");
         verifyBookmark(bookmarkAA, "aa", "http://aa.com/", false, folderA);
 
         BookmarkId folderAA = mBookmarkModel.addFolder(folderA, 0, "faa");
         verifyBookmark(folderAA, "faa", null, true, folderA);
     }
 
-    @UiThreadTest
-    @SmallTest
-    @CommandLineFlags.Add({ChromeSwitches.ENABLE_OFFLINE_PAGES})
-    @Feature({"Bookmark"})
-    public void testOfflineBridgeLoaded() {
-        assertTrue(mBookmarkModel.getOfflinePageBridge() != null);
-        assertTrue(mBookmarkModel.getOfflinePageBridge().isOfflinePageModelLoaded());
-    }
-
     private BookmarkId addBookmark(final BookmarkId parent, final int index, final String title,
             final String url) {
         final AtomicReference<BookmarkId> result = new AtomicReference<BookmarkId>();
         final Semaphore semaphore = new Semaphore(0);
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                mBookmarkModel.addBookmarkAsync(
-                        parent, index, title, url, null, new AddBookmarkCallback() {
-                            @Override
-                            public void onBookmarkAdded(
-                                    final BookmarkId bookmarkId, int saveResult) {
-                                result.set(bookmarkId);
-                                semaphore.release();
-                            }
-                        });
+                result.set(mBookmarkModel.addBookmark(parent, index, title, url));
+                semaphore.release();
             }
         });
         try {
             if (semaphore.tryAcquire(TIMEOUT_MS, TimeUnit.MILLISECONDS)) {
                 return result.get();
             } else {
                 return null;
             }
         } catch (InterruptedException e) {
             return null;
@@ skipping 19 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());
     }
 }