Adding security info to canceled requests

webkit/tools/test_shell/simple_resource_loader_bridge.cc

 // Copyright (c) 2006-2008 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.
 //
 // This file contains an implementation of the ResourceLoaderBridge class.
 // The class is implemented using URLRequest, meaning it is a "simple" version
 // that directly issues requests. The more complicated one used in the
 // browser uses IPC.
 //
 // Because URLRequest only provides an asynchronous resource loading API, this
@@ skipping 154 matching lines @@
     // race condition).  If the order of the next 2 functions were reversed, the
     // peer could generate new requests in reponse to the received data, which
     // when run on the io thread, could race against this function in doing
     // another InvokeLater.  See bug 769249.
     io_thread->message_loop()->PostTask(FROM_HERE, NewRunnableMethod(
         this, &RequestProxy::AsyncReadData));
 
     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
     }
   }
 
   // --------------------------------------------------------------------------
   // The following methods are called on the io thread.  They correspond to
   // actions performed on the owner's thread.
 
   void AsyncStart(RequestParams* params) {
     request_.reset(new URLRequest(params->url, this));
@@ skipping 50 matching lines @@
       bool content_filtered) {
     owner_loop_->PostTask(FROM_HERE, NewRunnableMethod(
         this, &RequestProxy::NotifyReceivedResponse, info, content_filtered));
   }
 
   virtual void OnReceivedData(int bytes_read) {
     owner_loop_->PostTask(FROM_HERE, NewRunnableMethod(
         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));
   }
 
   // --------------------------------------------------------------------------
   // URLRequest::Delegate implementation:
 
   virtual void OnReceivedRedirect(URLRequest* request,
                                   const GURL& new_url) {
     DCHECK(request->status().is_success());
     OnReceivedRedirect(new_url);
   }
@@ skipping 20 matching lines @@
     } else {
       Done();
     }
   }
 
   // --------------------------------------------------------------------------
   // Helpers and data:
 
   void Done() {
     DCHECK(request_.get());
-    OnCompletedRequest(request_->status());
+    OnCompletedRequest(request_->status(), std::string());
     request_.reset();  // destroy on the io thread
   }
 
   scoped_ptr<URLRequest> request_;
 
   // Size of our async IO data buffers
   static const int kDataSize = 16*1024;
 
   // read buffer for async IO
   scoped_refptr<net::IOBuffer> buf_;
@@ skipping 264 matching lines @@
 // static
 void SimpleResourceLoaderBridge::Shutdown() {
   if (io_thread) {
     delete io_thread;
     io_thread = NULL;
 
     DCHECK(!request_context) << "should have been nulled by thread dtor";
   }
 }