[Android WebView] Implement a better OnReceivedError callback

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

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwWebContentsObserverTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwWebContentsObserverTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwWebContentsObserverTest.java
index eb3d7f711452eeb70010980c3f01d8995a3e913e..db0e1e377a4d472ac7eeb09821386c78dee3a611 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwWebContentsObserverTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwWebContentsObserverTest.java
@@ -11,7 +11,6 @@ import org.chromium.android_webview.AwContentsStatics;
 import org.chromium.android_webview.AwWebContentsObserver;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.MinAndroidSdkLevel;
-import org.chromium.net.NetError;
 
 /**
  * Tests for the AwWebContentsObserver class.
@@ -65,26 +64,6 @@ public class AwWebContentsObserverTest extends AwTestBase  {
         assertEquals("onPageFinished should be called for main frame navigations.", callCount + 1,
                 mContentsClient.getOnPageFinishedHelper().getCallCount());
 
-        boolean provisionalLoad = true;
-
-        callCount = mContentsClient.getOnPageFinishedHelper().getCallCount();
-        mWebContentsObserver.didFailLoad(!provisionalLoad, mainFrame,
-                NetError.ERR_ABORTED, ERROR_DESCRIPTION, EXAMPLE_URL);
-        assertEquals("onPageFinished should be called for main frame errors.", callCount + 1,
-                mContentsClient.getOnPageFinishedHelper().getCallCount());
-
-        callCount = mContentsClient.getOnPageFinishedHelper().getCallCount();
-        mWebContentsObserver.didFailLoad(!provisionalLoad, subFrame,
-                NetError.ERR_ABORTED, ERROR_DESCRIPTION, EXAMPLE_URL);
-        assertEquals("onPageFinished should only be called for main frame errors.", callCount,
-                mContentsClient.getOnPageFinishedHelper().getCallCount());
-
-        callCount = mContentsClient.getOnPageFinishedHelper().getCallCount();
-        mWebContentsObserver.didFailLoad(!provisionalLoad, mainFrame,
-                NetError.ERR_ABORTED, ERROR_DESCRIPTION, mUnreachableWebDataUrl);
-        assertEquals("onPageFinished should not be called on unrechable url errors.", callCount,
-                mContentsClient.getOnPageFinishedHelper().getCallCount());
-
         String baseUrl = null;
         boolean navigationToDifferentPage = true;
         boolean fragmentNavigation = true;
@@ -104,32 +83,6 @@ public class AwWebContentsObserverTest extends AwTestBase  {
 
     @SmallTest
     @Feature({"AndroidWebView"})
-    public void testOnReceivedError() {
-        boolean provisionalLoad = true;
-        boolean mainFrame = true;
-        boolean subFrame = false;
-
-        int callCount = mContentsClient.getOnReceivedErrorHelper().getCallCount();
-        mWebContentsObserver.didFailLoad(!provisionalLoad, subFrame,
-                NetError.ERR_TIMED_OUT, ERROR_DESCRIPTION, EXAMPLE_URL);
-        assertEquals("onReceivedError should only be called for the main frame", callCount,
-                mContentsClient.getOnReceivedErrorHelper().getCallCount());
-
-        callCount = mContentsClient.getOnReceivedErrorHelper().getCallCount();
-        mWebContentsObserver.didFailLoad(!provisionalLoad, mainFrame,
-                NetError.ERR_TIMED_OUT, ERROR_DESCRIPTION, EXAMPLE_URL);
-        assertEquals("onReceivedError should be called for the main frame", callCount + 1,
-                mContentsClient.getOnReceivedErrorHelper().getCallCount());
-
-        callCount = mContentsClient.getOnReceivedErrorHelper().getCallCount();
-        mWebContentsObserver.didFailLoad(!provisionalLoad, mainFrame,
-                NetError.ERR_ABORTED, ERROR_DESCRIPTION, EXAMPLE_URL);
-        assertEquals("onReceivedError should not be called for aborted navigations", callCount,
-                mContentsClient.getOnReceivedErrorHelper().getCallCount());
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView"})
     public void testDidNavigateMainFrame() {
         String nullUrl = null;
         String baseUrl = null;