Adding security info to canceled requests

chrome/browser/ssl/ssl_manager.cc

Index: chrome/browser/ssl/ssl_manager.cc
===================================================================
--- chrome/browser/ssl/ssl_manager.cc	(revision 9948)
+++ chrome/browser/ssl/ssl_manager.cc	(working copy)
@@ -338,7 +338,11 @@
       // 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;
 
@@ -591,7 +595,8 @@
   // 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()) {