[Sync] Some cleanup of SyncTestUtil.

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

Index: chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/TypedUrlsTest.java
diff --git a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/TypedUrlsTest.java b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/TypedUrlsTest.java
index 6e7ad5f3fe3f3fcdc09572cd0b993066ff887d8b..f76f5c37cad44e9a88ef157d4127ca94db2f7b8f 100644
--- a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/TypedUrlsTest.java
+++ b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/TypedUrlsTest.java
@@ -71,7 +71,7 @@ public class TypedUrlsTest extends SyncTestBase {
     @Feature({"Sync"})
     public void testDownloadTypedUrl() throws Exception {
         addServerTypedUrl(URL);
-        SyncTestUtil.triggerSyncAndWaitForCompletion(mContext);
+        SyncTestUtil.triggerSyncAndWaitForCompletion();
 
         // Verify data synced to client.
         List<TypedUrl> typedUrls = getClientTypedUrls();
@@ -87,7 +87,7 @@ public class TypedUrlsTest extends SyncTestBase {
     public void testDownloadDeletedTypedUrl() throws Exception {
         // Add the entity to test deleting.
         addServerTypedUrl(URL);
-        SyncTestUtil.triggerSyncAndWaitForCompletion(mContext);
+        SyncTestUtil.triggerSyncAndWaitForCompletion();
         assertServerTypedUrlCountWithName(1, URL);
         assertClientTypedUrlCount(1);
 
@@ -95,7 +95,7 @@ public class TypedUrlsTest extends SyncTestBase {
         TypedUrl typedUrl = getClientTypedUrls().get(0);
         mFakeServerHelper.deleteEntity(typedUrl.id);
         waitForServerTypedUrlCountWithName(0, URL);
-        SyncTestUtil.triggerSyncAndWaitForCompletion(mContext);
+        SyncTestUtil.triggerSyncAndWaitForCompletion();
         waitForClientTypedUrlCount(0);
     }
 
@@ -151,7 +151,7 @@ public class TypedUrlsTest extends SyncTestBase {
                     throw new RuntimeException(e);
                 }
             }
-        }, SyncTestUtil.UI_TIMEOUT_MS, SyncTestUtil.CHECK_INTERVAL_MS);
+        }, SyncTestUtil.TIMEOUT_MS, SyncTestUtil.INTERVAL_MS);
         assertTrue("Expected " + count + " local typed URL entities.", success);
     }
 
@@ -167,7 +167,7 @@ public class TypedUrlsTest extends SyncTestBase {
                     throw new RuntimeException(e);
                 }
             }
-        }, SyncTestUtil.UI_TIMEOUT_MS, SyncTestUtil.CHECK_INTERVAL_MS);
+        }, SyncTestUtil.TIMEOUT_MS, SyncTestUtil.INTERVAL_MS);
         assertTrue("Expected " + count + " server typed URLs with name " + name + ".", success);
     }
 }