[Sync] Some cleanup of SyncTestUtil.

chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java

Index: chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java
diff --git a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java
index 4360d4ef708beb6dad8e8d5ffae1a8bd547dd06d..fd590632dd8d185229ab871e601ee1609e04788b 100644
--- a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java
+++ b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java
@@ -129,8 +129,6 @@ public class SyncTestBase extends ChromeActivityTestCaseBase<ChromeActivity> {
     protected Account setUpTestAccountAndSignInToSync() throws InterruptedException {
         Account account = setUpTestAccount();
         signIn(account);
-        assertTrue("Sync everything should be enabled",
-                SyncTestUtil.isSyncEverythingEnabled(mContext));
         return account;
     }
 
@@ -141,7 +139,7 @@ public class SyncTestBase extends ChromeActivityTestCaseBase<ChromeActivity> {
                 SyncController.get(mContext).start();
             }
         });
-        SyncTestUtil.waitForSyncActive(mContext);
+        SyncTestUtil.waitForSyncActive();
     }
 
     protected void stopSync() {
@@ -177,7 +175,7 @@ public class SyncTestBase extends ChromeActivityTestCaseBase<ChromeActivity> {
                 });
             }
         });
-        assertTrue(s.tryAcquire(SyncTestUtil.UI_TIMEOUT_MS, TimeUnit.MILLISECONDS));
+        assertTrue(s.tryAcquire(SyncTestUtil.TIMEOUT_MS, TimeUnit.MILLISECONDS));
         SyncTestUtil.verifySyncIsSignedOut(mContext);
     }
 
@@ -189,7 +187,7 @@ public class SyncTestBase extends ChromeActivityTestCaseBase<ChromeActivity> {
             public boolean isSatisfied() {
                 return !ProfileSyncService.get().isSyncRequested();
             }
-        }, SyncTestUtil.UI_TIMEOUT_MS, SyncTestUtil.CHECK_INTERVAL_MS);
+        }, SyncTestUtil.TIMEOUT_MS, SyncTestUtil.INTERVAL_MS);
         assertTrue("Timed out waiting for sync to stop.", syncStopped);
     }