[Android WebView] Implement a better OnReceivedError callback

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

Index: android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java b/android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
index 7c8884d198b8e238e25b3361f0ef1d6fbb0b3716..a890f5d2b38cddf9a8630035f815d1869f9bccb4 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
@@ -29,6 +29,7 @@ public class TestAwContentsClient extends NullContentsClient {
     private final OnPageFinishedHelper mOnPageFinishedHelper;
     private final OnPageCommitVisibleHelper mOnPageCommitVisibleHelper;
     private final OnReceivedErrorHelper mOnReceivedErrorHelper;
+    private final OnReceivedError2Helper mOnReceivedError2Helper;
     private final OnReceivedHttpErrorHelper mOnReceivedHttpErrorHelper;
     private final CallbackHelper mOnReceivedSslErrorHelper;
     private final OnDownloadStartHelper mOnDownloadStartHelper;
@@ -47,6 +48,7 @@ public class TestAwContentsClient extends NullContentsClient {
         mOnPageFinishedHelper = new OnPageFinishedHelper();
         mOnPageCommitVisibleHelper = new OnPageCommitVisibleHelper();
         mOnReceivedErrorHelper = new OnReceivedErrorHelper();
+        mOnReceivedError2Helper = new OnReceivedError2Helper();
         mOnReceivedHttpErrorHelper = new OnReceivedHttpErrorHelper();
         mOnReceivedSslErrorHelper = new CallbackHelper();
         mOnDownloadStartHelper = new OnDownloadStartHelper();
@@ -77,6 +79,10 @@ public class TestAwContentsClient extends NullContentsClient {
         return mOnReceivedErrorHelper;
     }
 
+    public OnReceivedError2Helper getOnReceivedError2Helper() {
+        return mOnReceivedError2Helper;
+    }
+
     public OnReceivedHttpErrorHelper getOnReceivedHttpErrorHelper() {
         return mOnReceivedHttpErrorHelper;
     }
@@ -177,6 +183,11 @@ public class TestAwContentsClient extends NullContentsClient {
     }
 
     @Override
+    public void onReceivedError2(AwWebResourceRequest request, AwWebResourceError error) {
+        mOnReceivedError2Helper.notifyCalled(request, error);
+    }
+
+    @Override
     public void onReceivedSslError(ValueCallback<Boolean> callback, SslError error) {
         callback.onReceiveValue(mAllowSslError);
         mOnReceivedSslErrorHelper.notifyCalled();
@@ -461,6 +472,27 @@ public class TestAwContentsClient extends NullContentsClient {
     }
 
     /**
+     * CallbackHelper for OnReceivedError2.
+     */
+    public static class OnReceivedError2Helper extends CallbackHelper {
+        private AwWebResourceRequest mRequest;
+        private AwWebResourceError mError;
+        public void notifyCalled(AwWebResourceRequest request, AwWebResourceError error) {
+            mRequest = request;
+            mError = error;
+            notifyCalled();
+        }
+        public AwWebResourceRequest getRequest() {
+            assert getCallCount() > 0;
+            return mRequest;
+        }
+        public AwWebResourceError getError() {
+            assert getCallCount() > 0;
+            return mError;
+        }
+    }
+
+    /**
      * CallbackHelper for OnReceivedHttpError.
      */
     public static class OnReceivedHttpErrorHelper extends CallbackHelper {