Add utility method to wait for bookmark model to be loaded in tests.

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 fda3d27565cee52108d6122f78d454cc5c792395..3203783b64e45e223d6a4d8615eaa2129551d230 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
@@ -22,21 +22,19 @@ import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.UrlConstants;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem;
-import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkModelObserver;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.chrome.test.util.ActivityUtils;
+import org.chromium.chrome.test.util.BookmarkTestUtil;
 import org.chromium.chrome.test.util.ChromeTabUtils;
 import org.chromium.chrome.test.util.MenuUtils;
 import org.chromium.components.bookmarks.BookmarkId;
 import org.chromium.components.bookmarks.BookmarkType;
-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 bookmark manager.
@@ -76,38 +74,10 @@ public class BookmarkTest extends ChromeActivityTestCaseBase<ChromeActivity> {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                mBookmarkModel = new BookmarkModel(
-                        getActivity().getActivityTab().getProfile());
+                mBookmarkModel = new BookmarkModel(getActivity().getActivityTab().getProfile());
             }
         });
-        waitForBookmarkModelLoaded();
-    }
-
-    private void waitForBookmarkModelLoaded() throws InterruptedException {
-        final CallbackHelper loadedCallback = new CallbackHelper();
-        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
-            @Override
-            public void run() {
-                if (mBookmarkModel.isBookmarkModelLoaded()) loadedCallback.notifyCalled();
-                else {
-                    mBookmarkModel.addObserver(new BookmarkModelObserver() {
-                        @Override
-                        public void bookmarkModelChanged() {}
-
-                        @Override
-                        public void bookmarkModelLoaded() {
-                            loadedCallback.notifyCalled();
-                            mBookmarkModel.removeObserver(this);
-                        }
-                    });
-                }
-            }
-        });
-        try {
-            loadedCallback.waitForCallback(0);
-        } catch (TimeoutException e) {
-            Assert.fail("bookmark model did not load: Timeout.");
-        }
+        BookmarkTestUtil.waitForBookmarkModelLoaded();
     }
 
     private void openBookmarkManager() throws InterruptedException {