Adding security info to canceled requests

chrome/browser/renderer_host/safe_browsing_resource_handler.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/browser/renderer_host/safe_browsing_resource_handler.h"
 
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 
 // Maximum time to wait for a gethash response from the Safe Browsing servers.
 static const int kMaxGetHashMs = 1000;
@@ skipping 83 matching lines @@
 
   return next_handler_->OnWillRead(request_id, buf, buf_size, min_size);
 }
 
 bool SafeBrowsingResourceHandler::OnReadCompleted(int request_id,
                                                   int* bytes_read) {
   return next_handler_->OnReadCompleted(request_id, bytes_read);
 }
 
 bool SafeBrowsingResourceHandler::OnResponseCompleted(
-    int request_id, const URLRequestStatus& status) {
+    int request_id, const URLRequestStatus& status,
+    const std::string& security_info) {
   if ((in_safe_browsing_check_ ||
        safe_browsing_result_ != SafeBrowsingService::URL_SAFE) &&
       status.status() == URLRequestStatus::FAILED &&
       status.os_error() == net::ERR_NAME_NOT_RESOLVED) {
     // Got a DNS error while the safebrowsing check is in progress or we
     // already know that the site is unsafe.  Don't show the the dns error
     // page.
     queued_error_.reset(new URLRequestStatus(status));
     queued_error_request_id_ = request_id;
+    queued_security_info_ = security_info;
     return true;
   }
 
-  return next_handler_->OnResponseCompleted(request_id, status);
+  return next_handler_->OnResponseCompleted(request_id, status, security_info);
 }
 
 // SafeBrowsingService::Client implementation, called on the IO thread once
 // the URL has been classified.
 void SafeBrowsingResourceHandler::OnUrlCheckResult(
     const GURL& url, SafeBrowsingService::UrlCheckResult result) {
   DCHECK(in_safe_browsing_check_);
   DCHECK(!displaying_blocking_page_);
 
   safe_browsing_result_ = result;
   in_safe_browsing_check_ = false;
 
   if (result == SafeBrowsingService::URL_SAFE) {
     if (paused_request_id_ != -1) {
       rdh_->PauseRequest(render_process_host_id_, paused_request_id_, false);
       paused_request_id_ = -1;
     }
 
     base::TimeDelta pause_delta;
     if (!pause_time_.is_null())
       pause_delta = base::Time::Now() - pause_time_;
     safe_browsing_->LogPauseDelay(pause_delta);
 
     if (queued_error_.get()) {
       next_handler_->OnResponseCompleted(
-          queued_error_request_id_, *queued_error_.get());
+          queued_error_request_id_, *queued_error_.get(),
+          queued_security_info_);
       queued_error_.reset();
+      queued_security_info_.clear();
     }
 
     Release();
   } else {
     displaying_blocking_page_ = true;
     safe_browsing_->DisplayBlockingPage(
         url, resource_type_, result, this, rdh_->ui_loop(),
         render_process_host_id_, render_view_id_);
   }
 }
 
 // SafeBrowsingService::Client implementation, called on the IO thread when
 // the user has decided to proceed with the current request, or go back.
 void SafeBrowsingResourceHandler::OnBlockingPageComplete(bool proceed) {
   DCHECK(displaying_blocking_page_);
   displaying_blocking_page_ = false;
 
   if (proceed) {
     safe_browsing_result_ = SafeBrowsingService::URL_SAFE;
     if (paused_request_id_ != -1) {
       rdh_->PauseRequest(render_process_host_id_, paused_request_id_, false);
       paused_request_id_ = -1;
     }
 
     if (queued_error_.get()) {
       next_handler_->OnResponseCompleted(
-          queued_error_request_id_, *queued_error_.get());
+          queued_error_request_id_, *queued_error_.get(),
+          queued_security_info_);
       queued_error_.reset();
+      queued_security_info_.clear();
     }
   } else {
     rdh_->CancelRequest(render_process_host_id_, paused_request_id_, false);
   }
 
   Release();
 }