Adding security info to canceled requests

chrome/common/security_filter_peer.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.
 
 #include "chrome/common/security_filter_peer.h"
 
 #include "base/gfx/png_encoder.h"
 #include "base/gfx/size.h"
 #include "base/string_util.h"
 #include "net/base/net_errors.h"
@@ skipping 96 matching lines @@
 void SecurityFilterPeer::OnReceivedResponse(
     const webkit_glue::ResourceLoaderBridge::ResponseInfo& info,
     bool content_filtered) {
   NOTREACHED();
 }
 
 void SecurityFilterPeer::OnReceivedData(const char* data, int len) {
   NOTREACHED();
 }
 
-void SecurityFilterPeer::OnCompletedRequest(const URLRequestStatus& status) {
+void SecurityFilterPeer::OnCompletedRequest(const URLRequestStatus& status,
+                                            const std::string& security_info) {
   NOTREACHED();
 }
 
 std::string SecurityFilterPeer::GetURLForDebugging() {
   return original_peer_->GetURLForDebugging();
 }
 
 // static
 void ProcessResponseInfo(
     const webkit_glue::ResourceLoaderBridge::ResponseInfo& info_in,
@@ skipping 40 matching lines @@
 void BufferedPeer::OnReceivedResponse(
     const webkit_glue::ResourceLoaderBridge::ResponseInfo& info,
     bool response_filtered) {
   ProcessResponseInfo(info, &response_info_, mime_type_);
 }
 
 void BufferedPeer::OnReceivedData(const char* data, int len) {
   data_.append(data, len);
 }
 
-void BufferedPeer::OnCompletedRequest(const URLRequestStatus& status) {
+void BufferedPeer::OnCompletedRequest(const URLRequestStatus& status,
+                                      const std::string& security_info) {
   // Make sure we delete ourselves at the end of this call.
   scoped_ptr<BufferedPeer> this_deleter(this);
 
   // Give sub-classes a chance at altering the data.
   if (status.status() != URLRequestStatus::SUCCESS || !DataReady()) {
     // Pretend we failed to load the resource.
     original_peer_->OnReceivedResponse(response_info_, true);
     URLRequestStatus status(URLRequestStatus::CANCELED, 0);
-    original_peer_->OnCompletedRequest(status);
+    original_peer_->OnCompletedRequest(status, security_info);
     return;
   }
 
   original_peer_->OnReceivedResponse(response_info_, true);
   if (!data_.empty())
     original_peer_->OnReceivedData(data_.data(),
                                    static_cast<int>(data_.size()));
-  original_peer_->OnCompletedRequest(status);
+  original_peer_->OnCompletedRequest(status, security_info);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ReplaceContentPeer
 
 ReplaceContentPeer::ReplaceContentPeer(
     webkit_glue::ResourceLoaderBridge* resource_loader_bridge,
     webkit_glue::ResourceLoaderBridge::Peer* peer,
     const std::string& mime_type,
     const std::string& data)
     : SecurityFilterPeer(resource_loader_bridge, peer),
       mime_type_(mime_type),
       data_(data) {
 }
 
 ReplaceContentPeer::~ReplaceContentPeer() {
 }
 
 void ReplaceContentPeer::OnReceivedResponse(
     const webkit_glue::ResourceLoaderBridge::ResponseInfo& info,
     bool content_filtered) {
   // Ignore this, we'll serve some alternate content in OnCompletedRequest.
 }
 
 void ReplaceContentPeer::OnReceivedData(const char* data, int len) {
   // Ignore this, we'll serve some alternate content in OnCompletedRequest.
 }
 
-void ReplaceContentPeer::OnCompletedRequest(const URLRequestStatus& status) {
+void ReplaceContentPeer::OnCompletedRequest(const URLRequestStatus& status,
+                                            const std::string& security_info) {
   webkit_glue::ResourceLoaderBridge::ResponseInfo info;
   ProcessResponseInfo(info, &info, mime_type_);
+  info.security_info = security_info;
   info.content_length = static_cast<int>(data_.size());
   original_peer_->OnReceivedResponse(info, true);
   if (!data_.empty())
     original_peer_->OnReceivedData(data_.data(),
                                    static_cast<int>(data_.size()));
-  original_peer_->OnCompletedRequest(URLRequestStatus());
+  original_peer_->OnCompletedRequest(URLRequestStatus(), security_info);
 
   // The request processing is complete, we must delete ourselves.
   delete this;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ImageFilterPeer
 
 ImageFilterPeer::ImageFilterPeer(
     webkit_glue::ResourceLoaderBridge* resource_loader_bridge,
@@ skipping 62 matching lines @@
   }
 
   // Copy the vector content to data_ which is a string.
   data_.clear();
   data_.resize(output.size());
   std::copy(output.begin(), output.end(), data_.begin());
 
   return true;
 }