commit 861cdae9c3d6e8bbff01bc8aca30081f6e7b686d
author Ben Murdoch <benm@google.com> Mon Mar 04 19:38:50 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 04 19:38:50 2013 +0000
tree e69359a20055d386d4424b85b55e5b540b8a8c67
parent cfcc9b8663682d441b98154ead4537ed5102f3ca
parent 78560083ff19355f1b119c3e34ea5cf975f10ce0

Merge "Fix WebChromeClientTest#testOnProgressChanged DO NOT MERGE" into jb-mr2-dev

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

diff --git a/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java b/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java
index 422c8fb..2a5044e 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java
@@ -64,7 +64,8 @@
         mOnUiThread.setWebChromeClient(webChromeClient);
 
         assertFalse(webChromeClient.hadOnProgressChanged());
-        mOnUiThread.loadUrlAndWaitForCompletion(TestHtmlConstants.HELLO_WORLD_URL);
+        String url = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
+        mOnUiThread.loadUrlAndWaitForCompletion(url);
 
         new PollingCheck(TEST_TIMEOUT) {
             @Override