[Sync] Fix flaky AndroidSyncSettings tests.

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

Index: sync/android/javatests/src/org/chromium/sync/AndroidSyncSettingsTest.java
diff --git a/sync/android/javatests/src/org/chromium/sync/AndroidSyncSettingsTest.java b/sync/android/javatests/src/org/chromium/sync/AndroidSyncSettingsTest.java
index ef26ce2e7ceb343dc90e772ab52a3b7a5cb181d8..e89c338547caad3976264ad0c9881c963db30efd 100644
--- a/sync/android/javatests/src/org/chromium/sync/AndroidSyncSettingsTest.java
+++ b/sync/android/javatests/src/org/chromium/sync/AndroidSyncSettingsTest.java
@@ -7,7 +7,6 @@ package org.chromium.sync;
 import android.accounts.Account;
 import android.content.Context;
 import android.os.Bundle;
-import android.test.FlakyTest;
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
@@ -145,18 +144,14 @@ public class AndroidSyncSettingsTest extends InstrumentationTestCase {
         });
     }
 
-    @FlakyTest
-    /*
-     * http://crbug.com/554154
-     * @SmallTest
-     * @Feature({"Sync"})
-     */
+    @SmallTest
+    @Feature({"Sync"})
     public void testAccountInitialization() throws InterruptedException {
         // mAccount was set to be syncable and not have periodic syncs.
         assertEquals(1, mSyncContentResolverDelegate.mSetIsSyncableCalls);
         assertEquals(1, mSyncContentResolverDelegate.mRemovePeriodicSyncCalls);
         AndroidSyncSettings.updateAccount(mContext, null);
-        getInstrumentation().waitForIdleSync();
+        mAccountManager.waitForGetAccountsTask();
         // mAccount was set to be not syncable.
         assertEquals(2, mSyncContentResolverDelegate.mSetIsSyncableCalls);
         assertEquals(1, mSyncContentResolverDelegate.mRemovePeriodicSyncCalls);
@@ -357,14 +352,12 @@ public class AndroidSyncSettingsTest extends InstrumentationTestCase {
                 mSyncSettingsObserver.receivedNotification());
     }
 
-    /*@SmallTest
-    @Feature({"Sync"})*/
-    // http://crbug.com/527856
-    @DisabledTest
+    @SmallTest
+    @Feature({"Sync"})
     public void testIsSyncableOnSigninAndNotOnSignout() throws InterruptedException {
         assertTrue(mSyncContentResolverDelegate.getIsSyncable(mAccount, mAuthority) == 1);
         AndroidSyncSettings.updateAccount(mContext, null);
-        getInstrumentation().waitForIdleSync();
+        mAccountManager.waitForGetAccountsTask();
         assertTrue(mSyncContentResolverDelegate.getIsSyncable(mAccount, mAuthority) == 0);
         AndroidSyncSettings.updateAccount(mContext, mAccount);
         assertTrue(mSyncContentResolverDelegate.getIsSyncable(mAccount, mAuthority) == 1);