[Sync] Check that user is signed out before AndroidSyncSettingsTest

components/sync/android/javatests/src/org/chromium/components/sync/AndroidSyncSettingsTest.java

Index: components/sync/android/javatests/src/org/chromium/components/sync/AndroidSyncSettingsTest.java
diff --git a/components/sync/android/javatests/src/org/chromium/components/sync/AndroidSyncSettingsTest.java b/components/sync/android/javatests/src/org/chromium/components/sync/AndroidSyncSettingsTest.java
index 4ed85724fee5bb56e083a60ab6097b14573e4d7e..31e45c5f2e81bd4e269dfc6d09ebc6c58fa0b050 100644
--- a/components/sync/android/javatests/src/org/chromium/components/sync/AndroidSyncSettingsTest.java
+++ b/components/sync/android/javatests/src/org/chromium/components/sync/AndroidSyncSettingsTest.java
@@ -16,6 +16,7 @@ import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.components.signin.AccountManagerHelper;
+import org.chromium.components.signin.ChromeSigninController;
 import org.chromium.components.signin.test.util.AccountHolder;
 import org.chromium.components.signin.test.util.FakeAccountManagerDelegate;
 import org.chromium.components.sync.AndroidSyncSettings.AndroidSyncSettingsObserver;
@@ -101,13 +102,14 @@ public class AndroidSyncSettingsTest extends InstrumentationTestCase {
 
     @Override
     protected void setUp() throws Exception {
-        mSyncContentResolverDelegate = new CountingMockSyncContentResolverDelegate();
         mContext = getInstrumentation().getTargetContext();
         setupTestAccounts(mContext);
 
+        mSyncContentResolverDelegate = new CountingMockSyncContentResolverDelegate();
         AndroidSyncSettings.overrideForTests(mContext, mSyncContentResolverDelegate);
         mAuthority = AndroidSyncSettings.getContractAuthority(mContext);
         final CallbackHelper callbackHelper = new CallbackHelper();
+        assertFalse(ChromeSigninController.get().isSignedIn());

[skym, 2017/05/15 22:10:35]

Should we be able to assertTrue(ChromeSigninController.get().isSignedIn());
later in this method?

[pavely, 2017/05/15 23:48:47]

No, AndroidSyncSettings reads signed in user from ChromeSigninController, but
doesn't modify it. Better idea would be to inject fake ChromeSigninController
into AndroidSyncSettings, but that's not how the code is setup right now.

In this change I'm trying to prove that interaction with ChromeSigninController
causes test failure. If my guess is confirmed I'll figure out how to fix it.

         AndroidSyncSettings.updateAccount(mContext, mAccount, new Callback<Boolean>() {
             @Override
             public void onResult(Boolean result) {