Revert of Remove client_certs from SSLCertRequestInfo.

chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h"
 
 #import <SecurityInterface/SFChooseIdentityPanel.h>
 #include <stddef.h>
 
 #include <utility>
@@ skipping 63 matching lines @@
 
  private:
   SSLClientCertificateSelectorCocoa* controller_;  // weak
 };
 
 namespace chrome {
 
 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);
 
   // Not all WebContentses can show modal dialogs.
   //
   // Use the top-level embedder if |contents| is a guest.
   // GetTopLevelWebContents() will return |contents| otherwise.
   // TODO(davidben): Move this hook to the WebContentsDelegate and only try to
   // show a dialog in Browser's implementation. https://crbug.com/456255
   if (web_modal::WebContentsModalDialogManager::FromWebContents(
           guest_view::GuestViewBase::GetTopLevelWebContents(contents)) ==
       nullptr)
     return;
 
   // The dialog manages its own lifetime.
   SSLClientCertificateSelectorCocoa* selector =
       [[SSLClientCertificateSelectorCocoa alloc]
           initWithBrowserContext:contents->GetBrowserContext()
                  certRequestInfo:cert_request_info
                         delegate:std::move(delegate)];
-  [selector displayForWebContents:contents clientCerts:std::move(client_certs)];
+  [selector displayForWebContents:contents];
 }
 
 }  // namespace chrome
 
 namespace {
 
 // These ClearTableViewDataSources... functions help work around a bug in macOS
 // 10.12 where SFChooseIdentityPanel leaks a window and some views, including
 // an NSTableView. Future events may make cause the table view to query its
 // dataSource, which will have been deallocated.
@@ skipping 80 matching lines @@
     // already to cancel the selection rather than continue with no
     // certificate. Otherwise, tell the backend which identity (or none) the
     // user selected.
     userResponded_ = YES;
     observer_->CertificateSelected(cert);
 
     constrainedWindow_->CloseWebContentsModalDialog();
   }
 }
 
-- (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]);
     }
   }
 
   // Get the message to display:
   NSString* message = l10n_util::GetNSStringF(
       IDS_CLIENT_CERT_DIALOG_TEXT,
       base::ASCIIToUTF16(
           observer_->cert_request_info()->host_and_port.ToString()));
 
   // Create and set up a system choose-identity panel.
@@ skipping 89 matching lines @@
 }
 
 - (void)onConstrainedWindowClosed {
   observer_->StopObserving();
   panel_.reset();
   constrainedWindow_.reset();
   [self release];
 }
 
 @end