Landing again the CL that adds security info to canceled requests (last time it was causing sync XMLHttpRequests to hang, breaking many layout tests).

TBR=darin
Review URL: http://codereview.chromium.org/39321

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11221 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 2 deletions

diff --git a/chrome/common/resource_dispatcher.cc b/chrome/common/resource_dispatcher.cc
index e9db613..76942ec 100644
--- a/chrome/common/resource_dispatcher.cc
+++ b/chrome/common/resource_dispatcher.cc
@@ -382,7 +382,8 @@ void ResourceDispatcher::OnReceivedRedirect(int request_id,
 }
 
 void ResourceDispatcher::OnRequestComplete(int request_id,
-                                           const URLRequestStatus& status) {
+                                           const URLRequestStatus& status,
+                                           const std::string& security_info) {
   PendingRequestList::iterator it = pending_requests_.find(request_id);
   if (it == pending_requests_.end()) {
     // this might happen for kill()ed requests on the webkit end, so perhaps
@@ -414,7 +415,7 @@ void ResourceDispatcher::OnRequestComplete(int request_id,
   // The request ID will be removed from our pending list in the destructor.
   // Normally, dispatching this message causes the reference-counted request to
   // die immediately.
-  peer->OnCompletedRequest(status);
+  peer->OnCompletedRequest(status, security_info);
 
   webkit_glue::NotifyCacheStats();
 }