[Android WebView] Filter out error page url in AwContentsClient.didFailLoad

It turns out, Blink also sends DidFailLoad for the error page, which was causing
testOnPageFinishedCalledAfterError test to fail.

BUG=370950,386300

Review URL: https://codereview.chromium.org/348843002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278934 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 9 deletions

diff --git a/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java b/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java
index 5c41d62..1971d67 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java
@@ -73,7 +73,10 @@ public abstract class AwContentsClient {
         @Override
         public void didFailLoad(boolean isProvisionalLoad,
                 boolean isMainFrame, int errorCode, String description, String failingUrl) {
-            if (isMainFrame) {
+            String unreachableWebDataUrl = AwContentsStatics.getUnreachableWebDataUrl();
+            boolean isErrorUrl =
+                    unreachableWebDataUrl != null && unreachableWebDataUrl.equals(failingUrl);
+            if (isMainFrame && !isErrorUrl) {
                 if (errorCode != NetError.ERR_ABORTED) {
                     // This error code is generated for the following reasons:
                     // - WebView.stopLoading is called,
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 5f9c51b..15c0bcd 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
@@ -9,7 +9,6 @@ import android.test.suitebuilder.annotation.MediumTest;
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.test.util.CommonResources;
 import org.chromium.android_webview.test.util.JSUtils;
-import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
 import org.chromium.net.test.util.TestWebServer;
@@ -49,13 +48,8 @@ public class ClientOnPageFinishedTest extends AwTestBase {
         assertEquals("data:text/html," + html, onPageFinishedHelper.getUrl());
     }
 
-    /**
-     * @MediumTest
-     * @Feature({"AndroidWebView"})
-     *
-     * http://crbug.com/386300
-     */
-    @DisabledTest
+    @MediumTest
+    @Feature({"AndroidWebView"})
     public void testOnPageFinishedCalledAfterError() throws Throwable {
         class LocalTestClient extends TestAwContentsClient {
             private boolean isOnReceivedErrorCalled = false;