[Android WebView] Implement OnReceivedHttpError 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 87e8f18342496e02c7346378696fa8adc8e10553..115b64fd9db2b753431bd2d1e164da545eece66a 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
@@ -9,6 +9,8 @@ import android.net.http.SslError;
 import android.webkit.ConsoleMessage;
 import android.webkit.ValueCallback;
 
+import org.chromium.android_webview.AwContentsClient.AwWebResourceRequest;
+import org.chromium.android_webview.AwWebResourceResponse;
 import org.chromium.base.ThreadUtils;
 import org.chromium.content.browser.test.util.CallbackHelper;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnEvaluateJavaScriptResultHelper;
@@ -25,6 +27,7 @@ public class TestAwContentsClient extends NullContentsClient {
     private final OnPageStartedHelper mOnPageStartedHelper;
     private final OnPageFinishedHelper mOnPageFinishedHelper;
     private final OnReceivedErrorHelper mOnReceivedErrorHelper;
+    private final OnReceivedHttpErrorHelper mOnReceivedHttpErrorHelper;
     private final CallbackHelper mOnReceivedSslErrorHelper;
     private final OnDownloadStartHelper mOnDownloadStartHelper;
     private final OnReceivedLoginRequestHelper mOnReceivedLoginRequestHelper;
@@ -41,6 +44,7 @@ public class TestAwContentsClient extends NullContentsClient {
         mOnPageStartedHelper = new OnPageStartedHelper();
         mOnPageFinishedHelper = new OnPageFinishedHelper();
         mOnReceivedErrorHelper = new OnReceivedErrorHelper();
+        mOnReceivedHttpErrorHelper = new OnReceivedHttpErrorHelper();
         mOnReceivedSslErrorHelper = new CallbackHelper();
         mOnDownloadStartHelper = new OnDownloadStartHelper();
         mOnReceivedLoginRequestHelper = new OnReceivedLoginRequestHelper();
@@ -66,6 +70,10 @@ public class TestAwContentsClient extends NullContentsClient {
         return mOnReceivedErrorHelper;
     }
 
+    public OnReceivedHttpErrorHelper getOnReceivedHttpErrorHelper() {
+        return mOnReceivedHttpErrorHelper;
+    }
+
     public CallbackHelper getOnReceivedSslErrorHelper() {
         return mOnReceivedSslErrorHelper;
     }
@@ -439,4 +447,32 @@ public class TestAwContentsClient extends NullContentsClient {
     public void doUpdateVisitedHistory(String url, boolean isReload) {
         getDoUpdateVisitedHistoryHelper().notifyCalled(url, isReload);
     }
+
+    /**
+     * CallbackHelper for OnReceivedHttpError.
+     */
+    public static class OnReceivedHttpErrorHelper extends CallbackHelper {
+        private AwWebResourceRequest mRequest;
+        private AwWebResourceResponse mResponse;
+
+        public void notifyCalled(AwWebResourceRequest request, AwWebResourceResponse response) {
+            mRequest = request;
+            mResponse = response;
+            notifyCalled();
+        }
+        public AwWebResourceRequest getRequest() {
+            assert getCallCount() > 0;
+            return mRequest;
+        }
+        public AwWebResourceResponse getResponse() {
+            assert getCallCount() > 0;
+            return mResponse;
+        }
+    }
+
+    @Override
+    public void onReceivedHttpError(AwWebResourceRequest request, AwWebResourceResponse response) {
+        super.onReceivedHttpError(request, response);
+        mOnReceivedHttpErrorHelper.notifyCalled(request, response);
+    }
 }