Revert of Move onReceivedError and onReceivedHttpError out of AwContentsIoThreadClientImpl

android_webview/browser/net/aw_network_delegate.cc

Index: android_webview/browser/net/aw_network_delegate.cc
diff --git a/android_webview/browser/net/aw_network_delegate.cc b/android_webview/browser/net/aw_network_delegate.cc
index 934e788d01fdb154760f59de95661be0f5ae1286..e7bb30c05f2c8a0441b35faf160e952f9d413ac1 100644
--- a/android_webview/browser/net/aw_network_delegate.cc
+++ b/android_webview/browser/net/aw_network_delegate.cc
@@ -5,10 +5,8 @@
 #include "android_webview/browser/net/aw_network_delegate.h"
 
 #include "android_webview/browser/aw_browser_context.h"
-#include "android_webview/browser/aw_contents_client_bridge_base.h"
 #include "android_webview/browser/aw_contents_io_thread_client.h"
 #include "android_webview/browser/aw_cookie_access_policy.h"
-#include "android_webview/browser/net/aw_web_resource_request.h"
 #include "base/android/build_info.h"
 #include "components/policy/core/browser/url_blacklist_manager.h"
 #include "content/public/browser/browser_thread.h"
@@ -23,21 +21,6 @@
 using content::BrowserThread;
 
 namespace android_webview {
-
-namespace {
-
-void OnReceivedHttpErrorOnUiThread(
-    const content::ResourceRequestInfo::WebContentsGetter& web_contents_getter,
-    const AwWebResourceRequest& request,
-    scoped_refptr<const net::HttpResponseHeaders> original_response_headers) {
-  AwContentsClientBridgeBase* client =
-      AwContentsClientBridgeBase::FromWebContentsGetter(web_contents_getter);
-  if (!client)
-    return;
-  client->OnReceivedHttpError(request, original_response_headers);
-}
-
-}  // namespace
 
 AwNetworkDelegate::AwNetworkDelegate() : url_blacklist_manager_(nullptr) {
 }
@@ -81,17 +64,15 @@
     scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
     GURL* allowed_unsafe_redirect_url) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  if (original_response_headers->response_code() >= 400) {
-    const content::ResourceRequestInfo* request_info =
-        content::ResourceRequestInfo::ForRequest(request);
-    // keep a ref before binding and posting to UI thread.
-    scoped_refptr<const net::HttpResponseHeaders> response_headers(
-        original_response_headers);
-    BrowserThread::PostTask(
-        BrowserThread::UI, FROM_HERE,
-        base::Bind(&OnReceivedHttpErrorOnUiThread,
-                   request_info->GetWebContentsGetterForRequest(),
-                   AwWebResourceRequest(*request), response_headers));
+  int render_process_id, render_frame_id;
+  if (original_response_headers->response_code() >= 400 &&
+      content::ResourceRequestInfo::GetRenderFrameForRequest(
+          request, &render_process_id, &render_frame_id)) {
+    std::unique_ptr<AwContentsIoThreadClient> io_thread_client =
+        AwContentsIoThreadClient::FromID(render_process_id, render_frame_id);
+    if (io_thread_client.get()) {
+      io_thread_client->OnReceivedHttpError(request, original_response_headers);
+    }
   }
   return net::OK;
 }