Chromium Code Reviews| 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..4546b4a26d07e119d7b3422599a6f69d2c5d3f4b 100644 |
| --- a/chrome/browser/chrome_content_browser_client.cc |
| +++ b/chrome/browser/chrome_content_browser_client.cc |
| @@ -1725,14 +1725,13 @@ 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( |
| render_process_id, render_frame_id); |
| WebContents* tab = WebContents::FromRenderFrameHost(rfh); |
| if (!tab) { |
| - NOTREACHED(); |
|
davidben
2014/09/23 22:57:24
Removed this NOTREACHED because it's not NOTREACHE
|
| + callback.Run(NULL); |
| return; |
| } |
| @@ -1741,6 +1740,7 @@ void ChromeContentBrowserClient::SelectClientCertificate( |
| if (prerender_contents) { |
| prerender_contents->Destroy( |
| prerender::FINAL_STATUS_SSL_CLIENT_CERTIFICATE_REQUESTED); |
| + callback.Run(NULL); |
| return; |
| } |
| @@ -1778,8 +1778,7 @@ void ChromeContentBrowserClient::SelectClientCertificate( |
| } |
| } |
| - chrome::ShowSSLClientCertificateSelector(tab, network_session, |
| - cert_request_info, callback); |
| + chrome::ShowSSLClientCertificateSelector(tab, cert_request_info, callback); |
| } |
| void ChromeContentBrowserClient::AddCertificate( |