Make bookmark related tests not flaky

chrome/android/javatests/src/org/chromium/chrome/browser/BookmarksBridgeTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/BookmarksBridgeTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/BookmarksBridgeTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/BookmarksBridgeTest.java
index e91892274074424c50b095df085e80bef424a2e9..fad25c8c7b6dbf8c32be191b73119374d960e459 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/BookmarksBridgeTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/BookmarksBridgeTest.java
@@ -13,6 +13,8 @@ import org.chromium.chrome.browser.BookmarksBridge.BookmarkItem;
 import org.chromium.chrome.browser.profiles.Profile;
 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;
@@ -39,6 +41,19 @@ public class BookmarksBridgeTest extends NativeLibraryTestBase {
                 Profile profile = Profile.getLastUsedProfile();
                 mBookmarksBridge = new BookmarksBridge(profile);
                 mBookmarksBridge.loadEmptyPartnerBookmarkShimForTesting();
+            }
+        });
+
+        CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
+            @Override
+            public boolean isSatisfied() {
+                return mBookmarksBridge.isBookmarkModelLoaded();
+            }
+        });
+
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
                 mMobileNode = mBookmarksBridge.getMobileFolderId();
                 mDesktopNode = mBookmarksBridge.getDesktopFolderId();
                 mOtherNode = mBookmarksBridge.getOtherFolderId();