Android WebView save/restoreState Part 2

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.android_webview.test;
 
 import android.os.SystemClock;
 import android.test.FlakyTest;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.view.MotionEvent;
 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;
 
 public class WebKitHitTestTest extends AndroidWebViewTestBase {
     private TestAwContentsClient mContentsClient;
     private AwTestContainerView mTestView;
     private AwContents mAwContents;
     private TestWebServer mWebServer;
 
     private static String HREF = "http://foo/";
     private static String ANCHOR_TEXT = "anchor text";
 
     @Override
     public void setUp() throws Exception {
         super.setUp();
         mContentsClient = new TestAwContentsClient();
         mTestView = createAwTestContainerViewOnMainSync(mContentsClient);
         mAwContents = mTestView.getAwContents();
         mWebServer = new TestWebServer(false);
     }
 
     @Override
     public void tearDown() throws Exception {
         // 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);
         }
         if (mWebServer != null) {
             mWebServer.shutdown();
         }
         super.tearDown();
     }
 
     private void setServerResponseAndLoad(String response) throws Throwable {
@@ skipping 15 matching lines @@
                 long eventTime = SystemClock.uptimeMillis();
                 mAwContents.onTouchEvent(MotionEvent.obtain(
                         eventTime, eventTime, MotionEvent.ACTION_DOWN,
                         (float)(mTestView.getRight() - mTestView.getLeft()) / 2,
                         (float)(mTestView.getBottom() - mTestView.getTop()) / 2,
                         0));
             }
         });
     }
 
-    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>() {
             @Override
             public Boolean call() {
                 AwContents.HitTestData data = mAwContents.getLastHitTestResult();
                 return type == data.hitTestResultType &&
                        (extra == null ? data.hitTestResultExtraData == null :
                        extra.equals(data.hitTestResultExtraData));
             }
@@ skipping 137 matching lines @@
         // this test to be valid.
         testSrcAnchorType();
 
         String page = CommonResources.makeHtmlPageFrom("",
                 "<div class=\"full_view\">div text</div>");
         setServerResponseAndLoad(page);
         simulateTouchCenterOfWebViewOnUiThread();
         assertTrue(pollForHitTestDataOnUiThread(HitTestResult.UNKNOWN_TYPE, null));
     }
 }