[Signin][Android] Fix confirm managed sync data dialog test

This CL fixes the ConfirmManagedSyncDataDialogIntegrationTest by
replacing the bundle null check by listener check during the
recreation, since the bundle can have null value when activity gets
recreated on oreo phones, this made the test flaky.

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

chrome/android/java/src/org/chromium/chrome/browser/signin/ConfirmManagedSyncDataDialog.java

@@ -55,13 +55,13 @@ public class ConfirmManagedSyncDataDialog extends DialogFragment
     }
 
     private void setListener(Listener listener) {
-        assert mListener == null;
+        assert listener != null;
         mListener = listener;
     }
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        if (savedInstanceState != null) {
+        if (mListener == null) {
             dismiss();
         }
         String title = getString(R.string.sign_in_managed_account);

chrome/android/javatests/src/org/chromium/chrome/browser/signin/ConfirmManagedSyncDataDialogIntegrationTest.java

@@ -17,7 +17,6 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 
 import org.chromium.base.test.util.CommandLineFlags;
-import org.chromium.base.test.util.DisabledTest;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
@@ -42,7 +41,6 @@ public class ConfirmManagedSyncDataDialogIntegrationTest extends DummyUiActivity
 
     @Test
     @LargeTest
-    @DisabledTest(message = "Flaky crbug.com/1054855")
     public void testDialogIsDismissedWhenRecreated() {
         ConfirmManagedSyncDataDialog dialog =
                 ConfirmManagedSyncDataDialog.create(mListenerMock, TEST_DOMAIN);