| Index: chrome/browser/chrome_content_browser_client.cc
|
| diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
| index 2ff880459fb57c0fa2ed83c445ca3e7b80e6ae81..b144541537130ec25201f76dc5995dd60a7cfb11 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -1725,7 +1725,6 @@ void ChromeContentBrowserClient::AllowCertificateError(
|
| void ChromeContentBrowserClient::SelectClientCertificate(
|
| int render_process_id,
|
| int render_frame_id,
|
| - const net::HttpNetworkSession* network_session,
|
| net::SSLCertRequestInfo* cert_request_info,
|
| const base::Callback<void(net::X509Certificate*)>& callback) {
|
| content::RenderFrameHost* rfh = content::RenderFrameHost::FromID(
|
| @@ -1733,6 +1732,7 @@ void ChromeContentBrowserClient::SelectClientCertificate(
|
| WebContents* tab = WebContents::FromRenderFrameHost(rfh);
|
| if (!tab) {
|
| NOTREACHED();
|
| + callback.Run(NULL);
|
| return;
|
| }
|
|
|
| @@ -1741,6 +1741,7 @@ void ChromeContentBrowserClient::SelectClientCertificate(
|
| if (prerender_contents) {
|
| prerender_contents->Destroy(
|
| prerender::FINAL_STATUS_SSL_CLIENT_CERTIFICATE_REQUESTED);
|
| + callback.Run(NULL);
|
| return;
|
| }
|
|
|
| @@ -1778,8 +1779,7 @@ void ChromeContentBrowserClient::SelectClientCertificate(
|
| }
|
| }
|
|
|
| - chrome::ShowSSLClientCertificateSelector(tab, network_session,
|
| - cert_request_info, callback);
|
| + chrome::ShowSSLClientCertificateSelector(tab, cert_request_info, callback);
|
| }
|
|
|
| void ChromeContentBrowserClient::AddCertificate(
|
|
|