net: make HSTS hosts use the normal SSL interstitials

content/browser/ssl/ssl_cert_error_handler.cc

Index: content/browser/ssl/ssl_cert_error_handler.cc
diff --git a/content/browser/ssl/ssl_cert_error_handler.cc b/content/browser/ssl/ssl_cert_error_handler.cc
index c668b411d400d461232b4c8cabc0acfe0affa309..3c806102e22de08039472059a4554ef9bc061eea 100644
--- a/content/browser/ssl/ssl_cert_error_handler.cc
+++ b/content/browser/ssl/ssl_cert_error_handler.cc
@@ -4,6 +4,7 @@
 
 #include "content/browser/ssl/ssl_cert_error_handler.h"
 
+#include "net/base/cert_status_flags.h"

[wtc, 2011/09/26 19:15:10]

List this header before "net/base/x509_certificate.h".

 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/ssl/ssl_policy.h"
 #include "net/base/x509_certificate.h"
@@ -12,16 +13,13 @@ SSLCertErrorHandler::SSLCertErrorHandler(
     ResourceDispatcherHost* rdh,
     net::URLRequest* request,
     ResourceType::Type resource_type,
-    int cert_error,
-    net::X509Certificate* cert)
+    const net::SSLInfo& ssl_info,
+    bool is_hsts_host)
     : SSLErrorHandler(rdh, request, resource_type),
-      cert_error_(cert_error) {
+      ssl_info_(ssl_info),
+      cert_error_(net::MapCertStatusToNetError(ssl_info.cert_status)),
+      is_hsts_host_(is_hsts_host) {
   DCHECK(request == resource_dispatcher_host_->GetURLRequest(request_id_));
-
-  // We cannot use the request->ssl_info(), it's not been initialized yet, so
-  // we have to set the fields manually.
-  ssl_info_.cert = cert;
-  ssl_info_.SetCertError(cert_error);
 }
 
 SSLCertErrorHandler* SSLCertErrorHandler::AsSSLCertErrorHandler() {