Android WebView save/restoreState Part 2

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

Index: android_webview/javatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java
index 42c47894a47a8810eb0ee8d81a59361345bb9a16..59bd7c1ab2dac3aa25ea4a94d9dc9a8f85b91bbe 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java
@@ -13,8 +13,6 @@ import android.webkit.WebView.HitTestResult;
 import org.chromium.android_webview.AwContents;
 import org.chromium.base.test.util.Feature;
 import org.chromium.android_webview.test.util.CommonResources;
-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.concurrent.Callable;
@@ -42,12 +40,7 @@ public class WebKitHitTestTest extends AndroidWebViewTestBase {
         // TODO(boliu): This is to work around disk cache corruption bug on
         // unclean shutdown (crbug.com/154805).
         try {
-          runTestOnUiThread(new Runnable() {
-              @Override
-              public void run() {
-                  mAwContents.clearCache(true);
-              }
-          });
+          clearCacheOnUiThread(mAwContents, true);
         } catch (Throwable e) {
           throw new Exception(e);
         }
@@ -83,19 +76,6 @@ public class WebKitHitTestTest extends AndroidWebViewTestBase {
         });
     }
 
-    private boolean pollOnUiThread(final Callable<Boolean> callable) throws Throwable {
-        return CriteriaHelper.pollForCriteria(new Criteria() {
-            @Override
-            public boolean isSatisfied() {
-                try {
-                  return runTestOnUiThreadAndGetResult(callable);
-                } catch (Throwable e) {
-                    return false;
-                }
-            }
-        });
-    }
-
     private boolean pollForHitTestDataOnUiThread(
             final int type, final String extra) throws Throwable {
         return pollOnUiThread(new Callable<Boolean>() {