Revert "[Android] Remove force promo state update in BookmarkPromoRender tests"

This reverts commit b944e5d8.

Reason for revert: Still failing

Original change's description:
> [Android] Remove force promo state update in BookmarkPromoRender tests
>
> Updating the promo state forcefully is not required for these tests.
> This cl does not change the behavior of the tests. It changes how the
> environment is set up.
>
> This cl also enables testPersonalizedSigninPromoInBookmarkPage test.
>
> Bug: 1123478, 1133426
> Change-Id: I4382f857ca1e91676404fce1a1c6e76c315e4493
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2517684
> Reviewed-by: Marc Treib <treib@chromium.org>
> Commit-Queue: Tanmoy Mollik <triploblastic@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#824830}

TBR=treib@chromium.org,triploblastic@chromium.org

Change-Id: I7100fb19e156f700ee1ec84149904287fd41aec1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1123478
Bug: 1133426
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2523360Reviewed-by: Theresa  <twellington@chromium.org>
Commit-Queue: Theresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#824918}

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

@@ -22,6 +22,7 @@ import org.chromium.base.test.params.ParameterAnnotations;
 import org.chromium.base.test.params.ParameterizedRunner;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.DisableIf;
+import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
@@ -81,6 +82,7 @@ public class BookmarkPersonalizedPromoRenderTest {
     public void setUp() {
         // Native side needs to loaded before signing in test account.
         mActivityTestRule.startMainActivityOnBlankPage();
+        mAccountManagerTestRule.addTestAccountThenSigninAndEnableSync();
         TestThreadUtils.runOnUiThreadBlocking(() -> {
             BookmarkModel bookmarkModel = new BookmarkModel(Profile.getLastUsedRegularProfile());
             bookmarkModel.loadFakePartnerBookmarkShimForTesting();
@@ -100,12 +102,13 @@ public class BookmarkPersonalizedPromoRenderTest {
 
     @Test
     @MediumTest
+    @DisabledTest(message = "crbug.com/1136534")
     @Feature("RenderTest")
     @ParameterAnnotations.UseMethodParameter(NightModeTestUtils.NightModeParams.class)
     public void testPersonalizedSigninPromoInBookmarkPage(boolean nightModeEnabled)
             throws Exception {
-        mAccountManagerTestRule.addAccount(mAccountManagerTestRule.createProfileDataFromName(
-                AccountManagerTestRule.TEST_ACCOUNT_EMAIL));
+        BookmarkPromoHeader.forcePromoStateForTests(
+                BookmarkPromoHeader.PromoState.PROMO_SIGNIN_PERSONALIZED);
         mBookmarkTestRule.showBookmarkManager(mActivityTestRule.getActivity());
         mRenderTestRule.render(getPersonalizedPromoView(), "bookmark_personalized_signin_promo");
     }
@@ -115,7 +118,8 @@ public class BookmarkPersonalizedPromoRenderTest {
     @Feature("RenderTest")
     @ParameterAnnotations.UseMethodParameter(NightModeTestUtils.NightModeParams.class)
     public void testPersonalizedSyncPromoInBookmarkPage(boolean nightModeEnabled) throws Exception {
-        mAccountManagerTestRule.addTestAccountThenSignin();
+        BookmarkPromoHeader.forcePromoStateForTests(
+                BookmarkPromoHeader.PromoState.PROMO_SYNC_PERSONALIZED);
         mBookmarkTestRule.showBookmarkManager(mActivityTestRule.getActivity());
         mRenderTestRule.render(getPersonalizedPromoView(), "bookmark_personalized_sync_promo");
     }