[Android WebView] Implement a better OnReceivedError callback

android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h"
 
 #include <string>
 
 #include "android_webview/browser/aw_contents_io_thread_client.h"
 #include "android_webview/browser/aw_login_delegate.h"
 #include "android_webview/browser/aw_resource_context.h"
 #include "android_webview/common/url_constants.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "components/auto_login_parser/auto_login_parser.h"
 #include "components/navigation_interception/intercept_navigation_delegate.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/resource_controller.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/resource_dispatcher_host_login_delegate.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/browser/resource_throttle.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
+#include "net/url_request/url_request_status.h"
 #include "url/url_constants.h"
 
 using android_webview::AwContentsIoThreadClient;
 using content::BrowserThread;
 using content::ResourceType;
 using navigation_interception::InterceptNavigationDelegate;
 
 namespace {
 
 base::LazyInstance<android_webview::AwResourceDispatcherHostDelegate>
@@ skipping 197 matching lines @@
 }
 
 void AwResourceDispatcherHostDelegate::OnRequestRedirected(
     const GURL& redirect_url,
     net::URLRequest* request,
     content::ResourceContext* resource_context,
     content::ResourceResponse* response) {
   AddExtraHeadersIfNeeded(request, resource_context);
 }
 
+void AwResourceDispatcherHostDelegate::RequestComplete(
+    net::URLRequest* request) {
+  const content::ResourceRequestInfo* request_info =
+      content::ResourceRequestInfo::ForRequest(request);
+  if (!request_info) {

[sgurun-gerrit only, 2015/03/17 00:30:04]

curious if this can this can actually be null, since
chromeresourcedispatcherhostdelegate does not check for it.

[mnaganov (inactive), 2015/03/17 15:29:09]

Thanks for pointing this out! ChromeResourceDispatcherHostDelegate also checks
for null requests. Changed to match it.

+    DLOG(FATAL) << "Completed request without associated info: " <<
+        request->url();
+    return;
+  }
+
+  if (!request->status().is_success()) {
+    scoped_ptr<AwContentsIoThreadClient> io_client =
+        AwContentsIoThreadClient::FromID(request_info->GetChildID(),
+                                         request_info->GetRenderFrameID());
+    if (io_client) {
+      io_client->OnReceivedError(request);
+    }

[sgurun-gerrit only, 2015/03/17 00:30:04]

maybe dlog here if there is no io_client, otherwise the callback will silently
be dropped.

[mnaganov (inactive), 2015/03/17 15:29:09]

Done.

+  }
+}
+
 
 void AwResourceDispatcherHostDelegate::DownloadStarting(
     net::URLRequest* request,
     content::ResourceContext* resource_context,
     int child_id,
     int route_id,
     int request_id,
     bool is_content_initiated,
     bool must_download,
     ScopedVector<content::ResourceThrottle>* throttles) {
@@ skipping 164 matching lines @@
       net::HttpRequestHeaders headers;
       headers.AddHeadersFromString(extra_headers);
       for (net::HttpRequestHeaders::Iterator it(headers); it.GetNext(); ) {
         request->SetExtraRequestHeaderByName(it.name(), it.value(), false);
       }
     }
   }
 }
 
 }  // namespace android_webview