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 e7bb30c05f2c8a0441b35faf160e952f9d413ac1..ac7ade99745b95c9aee0534d0f6bde2ea4cedc7d 100644
--- a/android_webview/browser/net/aw_network_delegate.cc
+++ b/android_webview/browser/net/aw_network_delegate.cc
@@ -5,8 +5,10 @@
 #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"
@@ -18,8 +20,25 @@
 #include "net/proxy/proxy_server.h"
 #include "net/url_request/url_request.h"
 
+using android_webview::AwContentsClientBridgeBase;

[boliu, 2016/12/08 05:48:38]

you could put the anonymous namespace *inside* the android_webview namespace,
then you don't need these

[sgurun-gerrit only, 2016/12/08 21:56:46]

Done.

+using android_webview::AwWebResourceRequest;
 using content::BrowserThread;
 
+namespace {
+
+void OnReceivedHttpErrorOnUiThread(
+    const content::ResourceRequestInfo::WebContentsGetter& web_contents_getter,
+    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
+
 namespace android_webview {
 
 AwNetworkDelegate::AwNetworkDelegate() : url_blacklist_manager_(nullptr) {
@@ -64,15 +83,19 @@ int AwNetworkDelegate::OnHeadersReceived(
     scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
     GURL* allowed_unsafe_redirect_url) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  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);
-    }
+  if (original_response_headers->response_code() >= 400) {
+    const content::ResourceRequestInfo* request_info =
+        content::ResourceRequestInfo::ForRequest(request);
+    std::unique_ptr<AwWebResourceRequest> web_request(
+        new AwWebResourceRequest(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(),
+                   base::Owned(web_request.release()), response_headers));

[boliu, 2016/12/08 05:48:38]

do MakeUnique<AwWebResourceRequest>(request) here, don't need to declare
|web_request|. you have to change OnReceivedHttpErrorOnUiThread to receive
unique_ptr<AwWebResourceRequest> instead though

or you can just stack allocate AwWebResourceRequest, if copying is ok. I see
RunShouldInterceptRequest does stack allocation. Let's make this consistent

(not relevant after above comment, but use base::Passed for unique_ptrs)

[sgurun-gerrit only, 2016/12/08 21:56:46]

Done.

   }
   return net::OK;
 }