net: make HSTS hosts use the normal SSL interstitials

content/browser/ssl/ssl_manager.cc

Index: content/browser/ssl/ssl_manager.cc
diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc
index 2f88040c714df9a420532eff09d97507b445887b..5fdacd24bf173d5cc1b1805028d0dc7b1a0f61bd 100644
--- a/content/browser/ssl/ssl_manager.cc
+++ b/content/browser/ssl/ssl_manager.cc
@@ -24,9 +24,10 @@
 // static
 void SSLManager::OnSSLCertificateError(ResourceDispatcherHost* rdh,
                                        net::URLRequest* request,
-                                       int cert_error,
-                                       net::X509Certificate* cert) {
-  DVLOG(1) << "OnSSLCertificateError() cert_error: " << cert_error
+                                       const net::SSLInfo& ssl_info,
+                                       bool is_hsts_host) {
+  DVLOG(1) << "OnSSLCertificateError() cert_error: "
+           << net::MapCertStatusToNetError(ssl_info.cert_status)
            << " url: " << request->url().spec();

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

Optional: I suggest we log cert_status instead of cert_error.
You can add a TODO if you don't want to make the change now.

cert_status is a bit field, so we'd want to log it in hex,
perhaps with a std::hex iostream manipulator.

 
   ResourceDispatcherHostRequestInfo* info =
@@ -39,8 +40,8 @@ void SSLManager::OnSSLCertificateError(ResourceDispatcherHost* rdh,
       NewRunnableMethod(new SSLCertErrorHandler(rdh,
                                                 request,
                                                 info->resource_type(),
-                                                cert_error,
-                                                cert),
+                                                ssl_info,
+                                                is_hsts_host),
                         &SSLCertErrorHandler::Dispatch));
 }