Index: content/browser/ssl/ssl_manager.cc |
diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc |
index 0322de0d4d1ee1d279400e81963fc4b4ef84da35..4a044b024e938a523317c62c872d7963399b8302 100644 |
--- a/content/browser/ssl/ssl_manager.cc |
+++ b/content/browser/ssl/ssl_manager.cc |
@@ -33,25 +33,35 @@ using content::SSLStatus; |
using content::WebContents; |
// static |
-void SSLManager::OnSSLCertificateError(net::URLRequest* request, |
+void SSLManager::OnSSLCertificateError(SSLErrorHandler::Delegate* delegate, |
+ const content::GlobalRequestID& id, |
+ const ResourceType::Type resource_type, |
+ const GURL& url, |
+ int render_process_id, |
+ int render_view_id, |
const net::SSLInfo& ssl_info, |
bool fatal) { |
+ DCHECK(delegate); |
DVLOG(1) << "OnSSLCertificateError() cert_error: " |
<< net::MapCertStatusToNetError(ssl_info.cert_status) |
- << " url: " << request->url().spec() |
+ << " id: " << id.child_id << "," << id.request_id |
+ << " resource_type: " << resource_type |
+ << " url: " << url.spec() |
+ << " render_process_id: " << render_process_id |
+ << " render_view_id: " << render_view_id |
<< " cert_status: " << std::hex << ssl_info.cert_status; |
- const ResourceRequestInfoImpl* info = |
- ResourceRequestInfoImpl::ForRequest(request); |
- |
// A certificate error occurred. Construct a SSLCertErrorHandler object and |
// hand it over to the UI thread for processing. |
BrowserThread::PostTask( |
BrowserThread::UI, FROM_HERE, |
base::Bind(&SSLCertErrorHandler::Dispatch, |
- new SSLCertErrorHandler(ResourceDispatcherHostImpl::Get(), |
- request, |
- info->GetResourceType(), |
+ new SSLCertErrorHandler(delegate, |
+ id, |
+ resource_type, |
+ url, |
+ render_process_id, |
+ render_view_id, |
ssl_info, |
fatal))); |
} |