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, 9 insertions, 6 deletions

diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
index f6b10f3..2e94f3f 100644
--- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc
+++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
@@ -173,9 +173,10 @@ class RequestProxy : public URLRequest::Delegate,
     peer_->OnReceivedData(buf_copy.get(), bytes_read);
   }
 
-  void NotifyCompletedRequest(const URLRequestStatus& status) {
+  void NotifyCompletedRequest(const URLRequestStatus& status,
+                              const std::string& security_info) {
     if (peer_) {
-      peer_->OnCompletedRequest(status);
+      peer_->OnCompletedRequest(status, security_info);
       DropPeer();  // ensure no further notifications
     }
   }
@@ -246,9 +247,10 @@ class RequestProxy : public URLRequest::Delegate,
         this, &RequestProxy::NotifyReceivedData, bytes_read));
   }
 
-  virtual void OnCompletedRequest(const URLRequestStatus& status) {
+  virtual void OnCompletedRequest(const URLRequestStatus& status,
+                                  const std::string& security_info) {
     owner_loop_->PostTask(FROM_HERE, NewRunnableMethod(
-        this, &RequestProxy::NotifyCompletedRequest, status));
+        this, &RequestProxy::NotifyCompletedRequest, status, security_info));
   }
 
   // --------------------------------------------------------------------------
@@ -289,7 +291,7 @@ class RequestProxy : public URLRequest::Delegate,
 
   void Done() {
     DCHECK(request_.get());
-    OnCompletedRequest(request_->status());
+    OnCompletedRequest(request_->status(), std::string());
     request_.reset();  // destroy on the io thread
   }
 
@@ -340,7 +342,8 @@ class SyncRequestProxy : public RequestProxy {
     AsyncReadData();  // read more (may recurse)
   }
 
-  virtual void OnCompletedRequest(const URLRequestStatus& status) {
+  virtual void OnCompletedRequest(const URLRequestStatus& status,
+                                  const std::string& security_info) {
     result_->status = status;
     event_.Signal();
   }