Adding security info to canceled requests

chrome/browser/ssl/ssl_manager.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/ssl/ssl_manager.h"
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "grit/theme_resources.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 320 matching lines @@
   // notify the request twice, it may no longer exist and |this| might have
   // already have been deleted.
   DCHECK(!request_has_been_notified_);
 
   if (!request_has_been_notified_) {
     URLRequest* request = resource_dispatcher_host_->GetURLRequest(request_id_);
     if (request) {
       // The request can be NULL if it was cancelled by the renderer (as the
       // result of the user navigating to a new page from the location bar).
       DLOG(INFO) << "CompleteCancelRequest() url: " << request->url().spec();
-      request->CancelWithError(error);
+      SSLManager::CertError* cert_error = AsCertError();
+      if (cert_error)
+        request->SimulateSSLError(error, cert_error->ssl_info());
+      else
+        request->SimulateError(error);
     }
     request_has_been_notified_ = true;
 
     // We're done with this object on the IO thread.
     Release();
   }
 }
 
 void SSLManager::ErrorHandler::CompleteContinueRequest() {
   DCHECK(MessageLoop::current() == io_loop_);
@@ skipping 232 matching lines @@
       entry->ssl().set_security_bits(ssl_security_bits);
       changed = true;
     }
 
     ShowPendingMessages();
   }
 
   // An HTTPS response may not have a certificate for some reason.  When that
   // happens, use the unauthenticated (HTTP) rather than the authentication
   // broken security style so that we can detect this error condition.
-  if (net::IsCertStatusError(ssl_cert_status)) {
+  if (net::IsCertStatusError(ssl_cert_status) &&
+      !details->is_content_filtered) {
     changed |= SetMaxSecurityStyle(SECURITY_STYLE_AUTHENTICATION_BROKEN);
     if (!details->is_main_frame &&
         !details->entry->ssl().has_unsafe_content()) {
       details->entry->ssl().set_has_unsafe_content();
       changed = true;
     }
   } else if (details->entry->url().SchemeIsSecure() && !ssl_cert_id) {
     if (details->is_main_frame) {
       changed |= SetMaxSecurityStyle(SECURITY_STYLE_UNAUTHENTICATED);
     } else {
@@ skipping 114 matching lines @@
 
   if (ca_name) {
     // TODO(wtc): should we show the root CA's name instead?
     *ca_name = l10n_util::GetStringF(
         IDS_SECURE_CONNECTION_EV_CA,
         UTF8ToWide(cert.issuer().organization_names[0]));
   }
   return true;
 }