Make bookmark related tests not flaky

chrome/android/javatests/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarksModelTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarksModelTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarksModelTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarksModelTest.java
index f5e4aadca2f139509dadc26fc8b6e790e50911fa..4d1a00ebc84d36eb59763f6c43b133f25c36c334 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarksModelTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarksModelTest.java
@@ -4,7 +4,6 @@
 
 package org.chromium.chrome.browser.enhancedbookmarks;
 
-import android.test.FlakyTest;
 import android.test.UiThreadTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
@@ -15,6 +14,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;
@@ -36,12 +37,26 @@ public class EnhancedBookmarksModelTest extends NativeLibraryTestBase {
     protected void setUp() throws Exception {
         super.setUp();
         loadNativeLibraryAndInitBrowserProcess();
+
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 Profile profile = Profile.getLastUsedProfile();
                 mBookmarksModel = new EnhancedBookmarksModel(profile);
                 mBookmarksModel.loadEmptyPartnerBookmarkShimForTesting();
+            }
+        });
+
+        CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
+            @Override
+            public boolean isSatisfied() {
+                return mBookmarksModel.isBookmarkModelLoaded();
+            }
+        });
+
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
                 mMobileNode = mBookmarksModel.getMobileFolderId();
                 mDesktopNode = mBookmarksModel.getDesktopFolderId();
                 mOtherNode = mBookmarksModel.getOtherFolderId();
@@ -74,7 +89,7 @@ public class EnhancedBookmarksModelTest extends NativeLibraryTestBase {
         stack.push(mBookmarksModel.addBookmark(folderB, 0, "g", "http://kkimlabs.com"));
 
         List<BookmarkId> bookmarks = mBookmarksModel.getAllBookmarkIDsOrderedByCreationDate();
-        assertEquals(bookmarks.size(), stack.size());
+        assertEquals(stack.size(), bookmarks.size());
         for (BookmarkId returnedBookmark : bookmarks) {
             assertEquals(stack.pop(), returnedBookmark);
         }
@@ -111,14 +126,11 @@ public class EnhancedBookmarksModelTest extends NativeLibraryTestBase {
         verifyBookmark(bookmarkD, "kauri", "http://kauri.org/", false, folderA);
     }
 
-    /* Flaky: crbug.com/515489
-     *
-     * @UiThreadTest
-     * @SmallTest
-     * @Feature({"Bookmark"})
-     */
+
+    @UiThreadTest
+    @SmallTest
+    @Feature({"Bookmark" })
     @SuppressFBWarnings("DLS_DEAD_LOCAL_STORE")
-    @FlakyTest
     public void testMoveBookmarks() {
         BookmarkId bookmarkA = mBookmarksModel.addBookmark(mDesktopNode, 0, "a", "http://a.com");
         BookmarkId bookmarkB = mBookmarksModel.addBookmark(mOtherNode, 0, "b", "http://b.com");