| Index: chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm
|
| diff --git a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm
|
| index ff46f9c14060819a315b567f48fdab32a0ed448f..3ae6eca05e5776f7c44c67284fbd921d3e264070 100644
|
| --- a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm
|
| +++ b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm
|
| @@ -40,11 +40,11 @@
|
| public ConstrainedWindowMacDelegate {
|
| public:
|
| SSLClientAuthObserverCocoaBridge(
|
| - const content::BrowserContext* browser_context,
|
| + const net::HttpNetworkSession* network_session,
|
| net::SSLCertRequestInfo* cert_request_info,
|
| const chrome::SelectCertificateCallback& callback,
|
| SSLClientCertificateSelectorCocoa* controller)
|
| - : SSLClientAuthObserver(browser_context, cert_request_info, callback),
|
| + : SSLClientAuthObserver(network_session, cert_request_info, callback),
|
| controller_(controller) {
|
| }
|
|
|
| @@ -72,13 +72,14 @@
|
|
|
| void ShowSSLClientCertificateSelector(
|
| content::WebContents* contents,
|
| + const net::HttpNetworkSession* network_session,
|
| net::SSLCertRequestInfo* cert_request_info,
|
| const SelectCertificateCallback& callback) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| // The dialog manages its own lifetime.
|
| SSLClientCertificateSelectorCocoa* selector =
|
| [[SSLClientCertificateSelectorCocoa alloc]
|
| - initWithBrowserContext:contents->GetBrowserContext()
|
| + initWithNetworkSession:network_session
|
| certRequestInfo:cert_request_info
|
| callback:callback];
|
| [selector displayForWebContents:contents];
|
| @@ -88,14 +89,14 @@
|
|
|
| @implementation SSLClientCertificateSelectorCocoa
|
|
|
| -- (id)initWithBrowserContext:(const content::BrowserContext*)browserContext
|
| +- (id)initWithNetworkSession:(const net::HttpNetworkSession*)networkSession
|
| certRequestInfo:(net::SSLCertRequestInfo*)certRequestInfo
|
| callback:(const chrome::SelectCertificateCallback&)callback {
|
| - DCHECK(browserContext);
|
| + DCHECK(networkSession);
|
| DCHECK(certRequestInfo);
|
| if ((self = [super init])) {
|
| observer_.reset(new SSLClientAuthObserverCocoaBridge(
|
| - browserContext, certRequestInfo, callback, self));
|
| + networkSession, certRequestInfo, callback, self));
|
| }
|
| return self;
|
| }
|
|
|