Add callback to AndroidSyncSettings.updateAccount and fix related test

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.components.sync;
 
 import android.accounts.Account;
 import android.content.Context;
 import android.os.Bundle;
 import android.support.test.filters.SmallTest;
 import android.test.InstrumentationTestCase;
 
+import org.chromium.base.Callback;
 import org.chromium.base.ThreadUtils;
+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.test.util.AccountHolder;
 import org.chromium.components.signin.test.util.MockAccountManager;
 import org.chromium.components.sync.AndroidSyncSettings.AndroidSyncSettingsObserver;
 import org.chromium.components.sync.test.util.MockSyncContentResolverDelegate;
 
+import java.util.concurrent.TimeoutException;
+
 /**
  * Tests for AndroidSyncSettings.
  */
 @DisabledTest(message = "https://crbug.com/605567")
 public class AndroidSyncSettingsTest extends InstrumentationTestCase {
     private static class CountingMockSyncContentResolverDelegate
             extends MockSyncContentResolverDelegate {
         private int mGetMasterSyncAutomaticallyCalls;
         private int mGetSyncAutomaticallyCalls;
         private int mGetIsSyncableCalls;
@@ skipping 113 matching lines @@
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 AndroidSyncSettings.disableChromeSync(mContext);
             }
         });
     }
 
     @SmallTest
     @Feature({"Sync"})
-    public void testAccountInitialization() throws InterruptedException {
+    public void testAccountInitialization() throws InterruptedException, TimeoutException {
         // mAccount was set to be syncable and not have periodic syncs.
         assertEquals(1, mSyncContentResolverDelegate.mSetIsSyncableCalls);
         assertEquals(1, mSyncContentResolverDelegate.mRemovePeriodicSyncCalls);
-        AndroidSyncSettings.updateAccount(mContext, null);
-        mAccountManager.waitForGetAccountsTask();
+
+        final CallbackHelper callbackHelper = new CallbackHelper();
+        AndroidSyncSettings.updateAccount(mContext, null, new Callback<Boolean>() {
+            @Override
+            public void onResult(Boolean result) {
+                callbackHelper.notifyCalled();
+            }
+        });
+        callbackHelper.waitForCallback(0);
+
         // mAccount was set to be not syncable.
         assertEquals(2, mSyncContentResolverDelegate.mSetIsSyncableCalls);
         assertEquals(1, mSyncContentResolverDelegate.mRemovePeriodicSyncCalls);
         AndroidSyncSettings.updateAccount(mContext, mAlternateAccount);
         // mAlternateAccount was set to be syncable and not have periodic syncs.
         assertEquals(3, mSyncContentResolverDelegate.mSetIsSyncableCalls);
         assertEquals(2, mSyncContentResolverDelegate.mRemovePeriodicSyncCalls);
     }
 
     @SmallTest
@@ skipping 179 matching lines @@
                 mSyncSettingsObserver.receivedNotification());
 
         mSyncSettingsObserver.clearNotification();
         AndroidSyncSettings.disableChromeSync(mContext);
         assertFalse("disableChromeSync shouldn't observers",
                 mSyncSettingsObserver.receivedNotification());
     }
 
     @SmallTest
     @Feature({"Sync"})
-    public void testIsSyncableOnSigninAndNotOnSignout() throws InterruptedException {
+    public void testIsSyncableOnSigninAndNotOnSignout()
+            throws InterruptedException, TimeoutException {
         assertTrue(mSyncContentResolverDelegate.getIsSyncable(mAccount, mAuthority) == 1);
-        AndroidSyncSettings.updateAccount(mContext, null);
-        mAccountManager.waitForGetAccountsTask();
+
+        final CallbackHelper callbackHelper = new CallbackHelper();
+        AndroidSyncSettings.updateAccount(mContext, null, new Callback<Boolean>() {
+            @Override
+            public void onResult(Boolean result) {
+                callbackHelper.notifyCalled();
+            }
+        });
+        callbackHelper.waitForCallback(0);
+
         assertTrue(mSyncContentResolverDelegate.getIsSyncable(mAccount, mAuthority) == 0);
         AndroidSyncSettings.updateAccount(mContext, mAccount);
         assertTrue(mSyncContentResolverDelegate.getIsSyncable(mAccount, mAuthority) == 1);
     }
 
     /**
      * Regression test for crbug.com/475299.
      */
     @SmallTest
     @Feature({"Sync"})
@@ skipping 10 matching lines @@
         assertTrue(mSyncContentResolverDelegate.getIsSyncable(mAccount, mAuthority) == 0);
         assertTrue(mSyncContentResolverDelegate.getSyncAutomatically(mAccount, mAuthority));
 
         // Ensure bug is fixed.
         AndroidSyncSettings.enableChromeSync(mContext);
         assertTrue(mSyncContentResolverDelegate.getIsSyncable(mAccount, mAuthority) == 1);
         // Should still be enabled.
         assertTrue(mSyncContentResolverDelegate.getSyncAutomatically(mAccount, mAuthority));
     }
 }