[Android WebView] Lay the groundwork for a better onReceivedError

android_webview/java/src/org/chromium/android_webview/AwContents.java

Index: android_webview/java/src/org/chromium/android_webview/AwContents.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java
index 9384385d22831811b3e759d02cca213d8acfcb53..6f8fdc7435762144ce9499312b2816947d70b8aa 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
@@ -370,14 +370,14 @@ public class AwContents implements SmartClipProvider,
                 mContentsClient.getCallbackHelper().postOnLoadResource(url);
             }
 
-            if (request.isMainFrame && awWebResourceResponse != null
-                    && awWebResourceResponse.getData() == null) {
+            if (awWebResourceResponse != null && awWebResourceResponse.getData() == null) {
                 // In this case the intercepted URLRequest job will simulate an empty response
                 // which doesn't trigger the onReceivedError callback. For WebViewClassic
                 // compatibility we synthesize that callback. http://crbug.com/180950
                 mContentsClient.getCallbackHelper().postOnReceivedError(
-                        ErrorCodeConversionHelper.ERROR_UNKNOWN,
-                        null /* filled in by the glue layer */, url);
+                        request,
+                        /* error description filled in by the glue layer */
+                        new AwContentsClient.AwWebResourceError());
             }
             return awWebResourceResponse;
         }