Remove client_certs from SSLCertRequestInfo.

chrome/browser/ui/views/ssl_client_certificate_selector.cc

 // 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.
 
 #include "chrome/browser/ui/views/ssl_client_certificate_selector.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/client_certificate_delegate.h"
 #include "content/public/browser/web_contents.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_NSS_CERTS) && !defined(OS_CHROMEOS)
 #include "chrome/browser/ui/crypto_module_password_dialog_nss.h"
 #endif
 
 SSLClientCertificateSelector::SSLClientCertificateSelector(
     content::WebContents* web_contents,
     const scoped_refptr<net::SSLCertRequestInfo>& cert_request_info,
+    net::CertificateList client_certs,
     std::unique_ptr<content::ClientCertificateDelegate> delegate)
-    : CertificateSelector(cert_request_info->client_certs, web_contents),
+    : CertificateSelector(std::move(client_certs), web_contents),
       SSLClientAuthObserver(web_contents->GetBrowserContext(),
                             cert_request_info,
                             std::move(delegate)),
       WebContentsObserver(web_contents) {}
 
 SSLClientCertificateSelector::~SSLClientCertificateSelector() {}
 
 void SSLClientCertificateSelector::Init() {
   StartObserving();
   std::unique_ptr<views::Label> text_label(
@@ skipping 50 matching lines @@
 void SSLClientCertificateSelector::Unlocked(net::X509Certificate* cert) {
   CertificateSelected(cert);
   GetWidget()->Close();
 }
 
 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(content::BrowserThread::UI);
 
   // Not all WebContentses can show modal dialogs.
   //
   // TODO(davidben): Move this hook to the WebContentsDelegate and only try to
   // show a dialog in Browser's implementation. https://crbug.com/456255
   if (!SSLClientCertificateSelector::CanShow(contents))
     return;
 
   SSLClientCertificateSelector* selector = new SSLClientCertificateSelector(
-      contents, cert_request_info, std::move(delegate));
+      contents, cert_request_info, std::move(client_certs),
+      std::move(delegate));
   selector->Init();
   selector->Show();
 }
 
 }  // namespace chrome