Revert "[Android][Test] Fix flaky bookmark signin promo tests on tablet"

This reverts commit 8843210d.

Reason for revert: I suspect this is causing test failures on Lollipop Phone Tester: https://ci.chromium.org/p/chromium/builders/ci/Lollipop%20Phone%20Tester

https://test-results.appspot.com/dashboards/flakiness_dashboard.html#testType=chrome_public_test_apk&tests=org.chromium.chrome.browser.password_manager.OnboardingDialogIntegrationTest#testOnboardingAccepted
https://test-results.appspot.com/dashboards/flakiness_dashboard.html#testType=chrome_public_test_apk&tests=org.chromium.chrome.browser.infobar.SyncErrorInfoBarTest#testSyncErrorInfoBarForAuthErrorView
https://test-results.appspot.com/dashboards/flakiness_dashboard.html#testType=chrome_public_test_apk&tests=org.chromium.chrome.browser.sync.UkmTest#testMetricsConsent

Original change's description:
> [Android][Test] Fix flaky bookmark signin promo tests on tablet
> 
> This CL fixes the flaky bookmark signin promo tests on tablet by
> destroying the activity in SyncTestRule before tearing down the
> mock signin environment.
> 
> Bug: 1088464, 1088730
> Change-Id: Ide2179edc3f4e2ddd1e115d7b8aa512976dca548
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2224258
> Commit-Queue: Alice Wang <aliceywang@chromium.org>
> Reviewed-by: Tanmoy Mollik <triploblastic@chromium.org>
> Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#774096}

TBR=bsazonov@chromium.org,triploblastic@chromium.org,aliceywang@chromium.org

Change-Id: I029d6c6b2532819741553c2003c51ff3a96246b6
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1088464, 1088730
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2228721Reviewed-by: Thiemo Nagel <tnagel@chromium.org>
Commit-Queue: Thiemo Nagel <tnagel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#774543}

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

@@ -24,6 +24,7 @@ import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 
 import org.chromium.base.test.util.CommandLineFlags;
+import org.chromium.base.test.util.DisableIf;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
@@ -35,6 +36,7 @@ import org.chromium.chrome.test.util.BookmarkTestRule;
 import org.chromium.chrome.test.util.BookmarkTestUtil;
 import org.chromium.chrome.test.util.ChromeTabUtils;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
+import org.chromium.ui.test.util.UiDisableIf;
 
 /**
  * Tests different scenarios when the bookmark personalized signin promo is not shown.
@@ -57,6 +59,7 @@ public class BookmarkPersonalizedSigninPromoDismissTest {
         BookmarkPromoHeader.forcePromoStateForTests(null);
         BookmarkPromoHeader.setPrefPersonalizedSigninPromoDeclinedForTests(false);
         SigninPromoController.setSigninPromoImpressionsCountBookmarksForTests(0);
+        mSyncTestRule.startMainActivityFromLauncher();
 
         TestThreadUtils.runOnUiThreadBlocking(() -> {
             BookmarkModel bookmarkModel = new BookmarkModel(Profile.fromWebContents(
@@ -74,6 +77,7 @@ public class BookmarkPersonalizedSigninPromoDismissTest {
 
     @Test
     @MediumTest
+    @DisableIf.Device(type = {UiDisableIf.TABLET}) // https://crbug.com/1088730
     public void testPromoNotShownAfterBeingDismissed() {
         mBookmarkTestRule.showBookmarkManager(mSyncTestRule.getActivity());
         onView(withId(R.id.signin_promo_view_container)).check(matches(isDisplayed()));
@@ -107,6 +111,7 @@ public class BookmarkPersonalizedSigninPromoDismissTest {
 
     @Test
     @MediumTest
+    @DisableIf.Device(type = {UiDisableIf.TABLET}) // https://crbug.com/1088730
     public void testPromoImpressionCountIncrementAfterDisplayingSigninPromo() {
         assertEquals(0, SigninPromoController.getSigninPromoImpressionsCountBookmarks());
         mBookmarkTestRule.showBookmarkManager(mSyncTestRule.getActivity());

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

@@ -31,6 +31,7 @@ import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 
 import org.chromium.base.test.util.CommandLineFlags;
+import org.chromium.base.test.util.DisableIf;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.browser.signin.SigninActivityLauncher;
@@ -39,6 +40,7 @@ import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.util.BookmarkTestRule;
 import org.chromium.chrome.test.util.browser.signin.SigninTestUtil;
 import org.chromium.components.signin.metrics.SigninAccessPoint;
+import org.chromium.ui.test.util.UiDisableIf;
 
 /**
  * Tests for the personalized signin promo on the Bookmarks page.
@@ -64,6 +66,7 @@ public class BookmarkPersonalizedSigninPromoTest {
         BookmarkPromoHeader.forcePromoStateForTests(
                 BookmarkPromoHeader.PromoState.PROMO_SIGNIN_PERSONALIZED);
         SigninActivityLauncher.setLauncherForTest(mMockSigninActivityLauncher);
+        mSyncTestRule.startMainActivityFromLauncher();
     }
 
     @After
@@ -74,6 +77,7 @@ public class BookmarkPersonalizedSigninPromoTest {
 
     @Test
     @MediumTest
+    @DisableIf.Device(type = {UiDisableIf.TABLET}) // https://crbug.com/1088464
     public void testSigninButtonDefaultAccount() {
         doNothing()
                 .when(SigninActivityLauncher.get())
@@ -88,6 +92,7 @@ public class BookmarkPersonalizedSigninPromoTest {
 
     @Test
     @MediumTest
+    @DisableIf.Device(type = {UiDisableIf.TABLET}) // https://crbug.com/1088464
     public void testSigninButtonNotDefaultAccount() {
         doNothing()
                 .when(SigninActivityLauncher.get())
@@ -102,6 +107,7 @@ public class BookmarkPersonalizedSigninPromoTest {
 
     @Test
     @MediumTest
+    @DisableIf.Device(type = {UiDisableIf.TABLET}) // https://crbug.com/1088464
     public void testSigninButtonNewAccount() {
         doNothing()
                 .when(SigninActivityLauncher.get())

chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTestRule.java

@@ -32,7 +32,6 @@ import org.chromium.chrome.browser.signin.IdentityServicesProvider;
 import org.chromium.chrome.browser.signin.SigninManager;
 import org.chromium.chrome.browser.signin.UnifiedConsentServiceBridge;
 import org.chromium.chrome.test.ChromeActivityTestRule;
-import org.chromium.chrome.test.util.ApplicationTestUtils;
 import org.chromium.chrome.test.util.browser.signin.SigninTestUtil;
 import org.chromium.chrome.test.util.browser.sync.SyncTestUtil;
 import org.chromium.components.signin.base.CoreAccountInfo;
@@ -147,13 +146,7 @@ public class SyncTestRule extends ChromeActivityTestRule<ChromeActivity> {
         SigninTestUtil.setUpAuthForTesting();
     }
 
-    private void ruleTearDown() throws Exception {
-        Activity activity = getActivity();
-        if (activity != null) {
-            // Activity needs to be destroyed before tearing down the mock environment in case
-            // they registered some observers in the mock, e.g. bookmarks on tablet.
-            ApplicationTestUtils.finishActivity(activity);
-        }
+    private void ruleTearDown() {
         TestThreadUtils.runOnUiThreadBlocking(() -> {
             mProfileSyncService.requestStop();
             FakeServerHelper.deleteFakeServer();