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

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

 // Copyright 2014 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.test.util.Feature;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem;
 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 org.chromium.content.browser.test.util.Criteria;
-import org.chromium.content.browser.test.util.CriteriaHelper;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 
 /**
  * Tests for bookmark bridge
  */
 public class BookmarkBridgeTest extends NativeLibraryTestBase {
 
     private BookmarkBridge mBookmarkBridge;
     private BookmarkId mMobileNode;
     private BookmarkId mOtherNode;
     private BookmarkId mDesktopNode;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         loadNativeLibraryAndInitBrowserProcess();
+
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 Profile profile = Profile.getLastUsedProfile();
                 mBookmarkBridge = new BookmarkBridge(profile);
                 mBookmarkBridge.loadEmptyPartnerBookmarkShimForTesting();
             }
         });
 
-        CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
-            @Override
-            public boolean isSatisfied() {
-                return mBookmarkBridge.isBookmarkModelLoaded();
-            }
-        });
-
+        BookmarkTestUtil.waitForBookmarkModelLoaded();
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 mMobileNode = mBookmarkBridge.getMobileFolderId();
                 mDesktopNode = mBookmarkBridge.getDesktopFolderId();
                 mOtherNode = mBookmarkBridge.getOtherFolderId();
             }
         });
     }
 
@@ skipping 152 matching lines @@
                     mBookmarkBridge.getBookmarkById(folder).isFolder());
             assertTrue("Returned list contained unexpected key: ", idToDepth.containsKey(folder));
             assertEquals(idToDepth.get(folder), depth);
             idToDepth.remove(folder);
         }
         assertEquals(idToDepth.size(), 0);
         folderList.clear();
         depthList.clear();
     }
 }