Defalke testOnPageFinishedCalledAfterError

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

Index: android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
index 928948dd841790587dad86a52bd15b4f73f7125e..64a25964d496f0abeca328a7cac0837eb7a0256c 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
@@ -12,6 +12,8 @@ import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
 import org.chromium.net.test.util.TestWebServer;
 
+import java.util.concurrent.TimeUnit;
+
 /**
  * Tests for the ContentViewClient.onPageFinished() method.
  */
@@ -53,13 +55,19 @@ public class ClientOnPageFinishedTest extends AndroidWebViewTestBase {
 
         assertEquals(0, onReceivedErrorHelper.getCallCount());
 
-        String url = "http://man.id.be.really.surprised.if.this.address.existed.blah/";
+        String url = "http://localhost:7/non_existent";
         int onReceivedErrorCallCount = onReceivedErrorHelper.getCallCount();
         int onPageFinishedCallCount = onPageFinishedHelper.getCallCount();
         loadUrlAsync(mAwContents, url);
 
-        onReceivedErrorHelper.waitForCallback(onReceivedErrorCallCount);
-        onPageFinishedHelper.waitForCallback(onPageFinishedCallCount);
+        onReceivedErrorHelper.waitForCallback(onReceivedErrorCallCount,
+                                              1 /* numberOfCallsToWaitFor */,
+                                              WAIT_TIMEOUT_SECONDS,
+                                              TimeUnit.SECONDS);
+        onPageFinishedHelper.waitForCallback(onPageFinishedCallCount,
+                                              1 /* numberOfCallsToWaitFor */,
+                                              WAIT_TIMEOUT_SECONDS,
+                                              TimeUnit.SECONDS);
         assertEquals(1, onReceivedErrorHelper.getCallCount());
     }