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 3e3414b8f76798ec563fb93ed55935b15e91752a..6047e768dafc4b44f315ea109e5d22ea3880ba35 100644 |
--- a/content/browser/ssl/ssl_cert_error_handler.cc |
+++ b/content/browser/ssl/ssl_cert_error_handler.cc |
@@ -1,25 +1,24 @@ |
-// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
+// Copyright (c) 2012 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 "content/browser/ssl/ssl_cert_error_handler.h" |
#include "content/browser/renderer_host/resource_dispatcher_host.h" |
+#include "content/browser/ssl/ssl_manager.h" |
#include "content/browser/ssl/ssl_policy.h" |
#include "net/base/cert_status_flags.h" |
#include "net/base/x509_certificate.h" |
SSLCertErrorHandler::SSLCertErrorHandler( |
- ResourceDispatcherHost* rdh, |
- net::URLRequest* request, |
- ResourceType::Type resource_type, |
+ Delegate* delegate, |
+ const content::GlobalRequestID& id, |
darin (slow to review)
2012/02/28 23:36:44
So GlobalRequestID is being used to track both URL
Takashi Toyoshima
2012/02/29 00:15:24
Yes.
WebSockets require one int value, socket_id_
|
const net::SSLInfo& ssl_info, |
bool fatal) |
- : SSLErrorHandler(rdh, request, resource_type), |
+ : SSLErrorHandler(delegate, id), |
ssl_info_(ssl_info), |
cert_error_(net::MapCertStatusToNetError(ssl_info.cert_status)), |
fatal_(fatal) { |
- DCHECK(request == resource_dispatcher_host_->GetURLRequest(request_id_)); |
} |
SSLCertErrorHandler* SSLCertErrorHandler::AsSSLCertErrorHandler() { |