[android_webivew] Refactor polling checks in test code.

android_webview/javatests/src/org/chromium/android_webview/test/AwQuotaManagerBridgeTest.java

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwQuotaManagerBridgeTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwQuotaManagerBridgeTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwQuotaManagerBridgeTest.java
index 9e7610c4999a297b5729f3dadfde789f98b68427..8ea8630310c93e5193eea319de647d2d1886011a 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwQuotaManagerBridgeTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwQuotaManagerBridgeTest.java
@@ -14,13 +14,15 @@ import org.chromium.android_webview.AwSettings;
 import org.chromium.android_webview.test.util.AwQuotaManagerBridgeTestUtil;
 import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.test.util.CallbackHelper;
-import org.chromium.content.browser.test.util.Criteria;
-import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.net.test.util.TestWebServer;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.Callable;
 
+/**
+ * Tests for the AwQuotaManagerBridge.
+ */
 public class AwQuotaManagerBridgeTest extends AwTestBase {
     private TestAwContentsClient mContentsClient;
     private AwTestContainerView mTestView;
@@ -164,28 +166,20 @@ public class AwQuotaManagerBridgeTest extends AwTestBase {
         final long initialUsage = getUsageForOrigin(mOrigin);
 
         useAppCache();
-        assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
+        poll(new Callable<Boolean>() {
             @Override
-            public boolean isSatisfied() {
-                try {
-                    return getUsageForOrigin(mOrigin) > initialUsage;
-                } catch (Exception e) {
-                    return false;
-                }
+            public Boolean call() throws Exception {
+                return getUsageForOrigin(mOrigin) > initialUsage;
             }
-        }));
+        });
 
         deleteAllData();
-        assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
+        poll(new Callable<Boolean>() {
             @Override
-            public boolean isSatisfied() {
-                try {
-                    return getUsageForOrigin(mOrigin) == 0;
-                } catch (Exception e) {
-                    return false;
-                }
+            public Boolean call() throws Exception {
+                return getUsageForOrigin(mOrigin) == 0;
             }
-        }));
+        });
     }
 
     @LargeTest
@@ -194,28 +188,20 @@ public class AwQuotaManagerBridgeTest extends AwTestBase {
         final long initialUsage = getUsageForOrigin(mOrigin);
 
         useAppCache();
-        assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
+        poll(new Callable<Boolean>() {
             @Override
-            public boolean isSatisfied() {
-                try {
-                    return getUsageForOrigin(mOrigin) > initialUsage;
-                } catch (Exception e) {
-                    return false;
-                }
+            public Boolean call() throws Exception {
+                return getUsageForOrigin(mOrigin) > initialUsage;
             }
-        }));
+        });
 
         deleteOrigin(mOrigin);
-        assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
+        poll(new Callable<Boolean>() {
             @Override
-            public boolean isSatisfied() {
-                try {
-                    return getUsageForOrigin(mOrigin) == 0;
-                } catch (Exception e) {
-                    return false;
-                }
+            public Boolean call() throws Exception {
+                return getUsageForOrigin(mOrigin) == 0;
             }
-        }));
+        });
     }
 
     @LargeTest
@@ -223,15 +209,11 @@ public class AwQuotaManagerBridgeTest extends AwTestBase {
     public void testGetResultsMatch() throws Exception {
         useAppCache();
 
-        CriteriaHelper.pollForCriteria(new Criteria() {
+        poll(new Callable<Boolean>() {
             @Override
-            public boolean isSatisfied() {
-                try {
-                    return AwQuotaManagerBridgeTestUtil.getOrigins(
-                                AwQuotaManagerBridgeTest.this).mOrigins.length > 0;
-                } catch (Exception e) {
-                    return false;
-                }
+            public Boolean call() throws Exception {
+                return AwQuotaManagerBridgeTestUtil.getOrigins(
+                            AwQuotaManagerBridgeTest.this).mOrigins.length > 0;
             }
         });