Android WebView save/restoreState Part 2

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

Index: android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
index 03c2f21f7b0523a9e5bfb58ee52c918138bd4737..b7fc439e7ece67d4fe567d5f1d154b7f44ac88fa 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
@@ -19,6 +19,8 @@ import org.chromium.content.browser.ContentView;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.LoadUrlParams;
 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.content.browser.test.util.TestCallbackHelperContainer;
 import org.chromium.ui.gfx.ActivityNativeWindow;
 
@@ -270,4 +272,32 @@ public class AndroidWebViewTestBase
                 viewClient.getOnEvaluateJavaScriptResultHelper(),
                 code);
     }
+
+    /**
+     * Similar to CriteriaHelper.pollForCriteria but runs the callable on the UI thread.
+     * Note that exceptions are treated as failure.
+     */
+    protected 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;
+                }
+            }
+        });
+    }
+
+    protected void clearCacheOnUiThread(
+            final AwContents awContents,
+            final boolean includeDiskFiles) throws Throwable {
+        runTestOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+              awContents.clearCache(includeDiskFiles);
+            }
+        });
+    }
 }