commit 3b2bc1d067a21d4b864f5563629d7960ae0ebcc8
author George Mount <mount@google.com> Thu Jul 19 10:21:11 2012 -0700
committer Keun young Park <keunyoung@google.com> Thu Jul 19 11:02:02 2012 -0700
tree 5f5eabee50dc1e9b5e95a290e57a64f3a1d99c76
parent 9a647f1b9cdb27d782b433fe44fab5a15c1b6acb

DO NOT MERGE Fix assertion to use complete load check rather than one flag.

 Bug 6419879

Change-Id: I60c5701925dc1ce803879d0491dd8aac92a6759d

tests/src/android/webkit/cts/WebViewOnUiThread.java

diff --git a/tests/src/android/webkit/cts/WebViewOnUiThread.java b/tests/src/android/webkit/cts/WebViewOnUiThread.java
index 0a1547e..bb07d08 100644
--- a/tests/src/android/webkit/cts/WebViewOnUiThread.java
+++ b/tests/src/android/webkit/cts/WebViewOnUiThread.java
@@ -661,12 +661,11 @@
      * @param call The call to make on the UI thread prior to waiting.
      */
     private void callAndWait(Runnable call) {
-        synchronized (this) {
-            Assert.assertTrue("WebViewOnUiThread.load*AndWaitForCompletion calls "
-                    + "may not be mixed with load* calls directly on WebView "
-                    + "without calling waitForLoadCompletion after the load",
-                    !mLoaded);
-        }
+        Assert.assertTrue("WebViewOnUiThread.load*AndWaitForCompletion calls "
+                + "may not be mixed with load* calls directly on WebView "
+                + "without calling waitForLoadCompletion after the load",
+                !isLoaded());
+        clearLoad(); // clear any extraneous signals from a previous load.
         runOnUiThread(call);
         waitForLoadCompletion();
     }