Commit 655f0ae1 authored by Boris Sazonov's avatar Boris Sazonov Committed by Commit Bot

[Signin][Android] Remove ChromeSigninController from IdentityManagerIntegrationTest

Removes ChromeSigninController.get().setSignedInAccountName(null) from
IdentityManagerIntegrationTest. Almost all code that was using
ChromeSigninController has been migrated to IdentityManager, so
resetting sign-in state in this test is no longer necessary.

Bug: 1046412
Change-Id: Ibafb9acc8de1ea16d305898d21ac9689787851bd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2316163Reviewed-by: default avatarAlice Wang <aliceywang@chromium.org>
Commit-Queue: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#792209}
parent 179a9b6a
...@@ -17,7 +17,6 @@ import org.chromium.base.test.BaseJUnit4ClassRunner; ...@@ -17,7 +17,6 @@ import org.chromium.base.test.BaseJUnit4ClassRunner;
import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.test.util.browser.signin.AccountManagerTestRule; import org.chromium.chrome.test.util.browser.signin.AccountManagerTestRule;
import org.chromium.components.signin.AccountManagerFacadeProvider; import org.chromium.components.signin.AccountManagerFacadeProvider;
import org.chromium.components.signin.ChromeSigninController;
import org.chromium.components.signin.base.CoreAccountId; import org.chromium.components.signin.base.CoreAccountId;
import org.chromium.components.signin.base.CoreAccountInfo; import org.chromium.components.signin.base.CoreAccountInfo;
import org.chromium.components.signin.identitymanager.IdentityManager; import org.chromium.components.signin.identitymanager.IdentityManager;
...@@ -54,9 +53,6 @@ public class IdentityManagerIntegrationTest { ...@@ -54,9 +53,6 @@ public class IdentityManagerIntegrationTest {
NativeLibraryTestUtils.loadNativeLibraryAndInitBrowserProcess(); NativeLibraryTestUtils.loadNativeLibraryAndInitBrowserProcess();
// Make sure there is no account signed in yet.
ChromeSigninController.get().setSignedInAccountName(null);
mAccountManagerTestRule.waitForSeeding(); mAccountManagerTestRule.waitForSeeding();
TestThreadUtils.runOnUiThreadBlocking(() -> { TestThreadUtils.runOnUiThreadBlocking(() -> {
Profile profile = Profile.getLastUsedRegularProfile(); Profile profile = Profile.getLastUsedRegularProfile();
...@@ -76,9 +72,6 @@ public class IdentityManagerIntegrationTest { ...@@ -76,9 +72,6 @@ public class IdentityManagerIntegrationTest {
public void tearDown() { public void tearDown() {
TestThreadUtils.runOnUiThreadBlocking( TestThreadUtils.runOnUiThreadBlocking(
() -> { mIdentityMutator.reloadAllAccountsFromSystemWithPrimaryAccount(null); }); () -> { mIdentityMutator.reloadAllAccountsFromSystemWithPrimaryAccount(null); });
// TODO(https://crbug.com/1046412): Remove this.
ChromeSigninController.get().setSignedInAccountName(null);
} }
@Test @Test
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment