[Signin][Android] Add bookmark loading in bookmark signin promo tests

This CL adds bookmark loading in bookmark signin promo dismiss tests to
reduce its random flakiness.

Bug: 1045480
Change-Id: Ied531522a06e45ada3674ddfe6be987f5f5855c8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2031038
Commit-Queue: Alice Wang <aliceywang@chromium.org>
Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#744581}

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

@@ -9,7 +9,6 @@ import static android.support.test.espresso.action.ViewActions.click;
 import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
 import static android.support.test.espresso.assertion.ViewAssertions.matches;
 import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
 
 import static org.junit.Assert.assertEquals;
@@ -17,7 +16,6 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import android.support.test.InstrumentationRegistry;
-import android.support.test.espresso.matcher.ViewMatchers;
 import android.support.test.filters.MediumTest;
 
 import org.junit.After;
@@ -33,6 +31,7 @@ import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.browser.signin.IdentityServicesProvider;
 import org.chromium.chrome.browser.signin.SigninPromoController;
 import org.chromium.chrome.browser.sync.SyncTestRule;
+import org.chromium.chrome.browser.tab.TabImpl;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.util.BookmarkTestUtil;
 import org.chromium.chrome.test.util.ChromeTabUtils;
@@ -56,6 +55,13 @@ public class BookmarkPersonalizedSigninPromoDismissTest {
         BookmarkPromoHeader.setPrefPersonalizedSigninPromoDeclinedForTests(false);
         SigninPromoController.setSigninPromoImpressionsCountBookmarksForTests(0);
         mSyncTestRule.startMainActivityForSyncTest();
+
+        TestThreadUtils.runOnUiThreadBlocking(() -> {
+            BookmarkModel bookmarkModel = new BookmarkModel(
+                    ((TabImpl) mSyncTestRule.getActivity().getActivityTab()).getProfile());
+            bookmarkModel.loadFakePartnerBookmarkShimForTesting();
+            BookmarkTestUtil.waitForBookmarkModelLoaded();
+        });
     }
 
     @After
@@ -71,8 +77,7 @@ public class BookmarkPersonalizedSigninPromoDismissTest {
         checkPrePromoStatus();
         onView(withId(R.id.signin_promo_view_container)).check(matches(isDisplayed()));
         onView(withId(R.id.signin_promo_close_button)).perform(click());
-        onView(withId(R.id.signin_promo_view_container))
-                .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.GONE)));
+        onView(withId(R.id.signin_promo_view_container)).check(doesNotExist());
 
         closeBookmarkManager();
         BookmarkTestUtil.showBookmarkManager(mSyncTestRule.getActivity());