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 2143bfe73cfab2baec6bd910aff7db19becc68a8..680d24e203b57bec8a34027959c1284ea3812e7b 100644 |
--- a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm |
+++ b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm |
@@ -81,7 +81,6 @@ |
void ShowSSLClientCertificateSelector( |
content::WebContents* contents, |
net::SSLCertRequestInfo* cert_request_info, |
- net::CertificateList client_certs, |
std::unique_ptr<content::ClientCertificateDelegate> delegate) { |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
@@ -102,7 +101,7 @@ |
initWithBrowserContext:contents->GetBrowserContext() |
certRequestInfo:cert_request_info |
delegate:std::move(delegate)]; |
- [selector displayForWebContents:contents clientCerts:std::move(client_certs)]; |
+ [selector displayForWebContents:contents]; |
} |
} // namespace chrome |
@@ -203,23 +202,22 @@ |
} |
} |
-- (void)displayForWebContents:(content::WebContents*)webContents |
- clientCerts:(net::CertificateList)inputClientCerts { |
+- (void)displayForWebContents:(content::WebContents*)webContents { |
// Create an array of CFIdentityRefs for the certificates: |
- size_t numCerts = inputClientCerts.size(); |
+ size_t numCerts = observer_->cert_request_info()->client_certs.size(); |
identities_.reset(CFArrayCreateMutable( |
kCFAllocatorDefault, numCerts, &kCFTypeArrayCallBacks)); |
for (size_t i = 0; i < numCerts; ++i) { |
base::ScopedCFTypeRef<SecCertificateRef> cert( |
net::x509_util::CreateSecCertificateFromX509Certificate( |
- inputClientCerts[i].get())); |
+ observer_->cert_request_info()->client_certs[i].get())); |
if (!cert) |
continue; |
SecIdentityRef identity; |
if (SecIdentityCreateWithCertificate(NULL, cert, &identity) == noErr) { |
CFArrayAppendValue(identities_, identity); |
CFRelease(identity); |
- certificates_.push_back(inputClientCerts[i]); |
+ certificates_.push_back(observer_->cert_request_info()->client_certs[i]); |
} |
} |