Refactor client cert private key handling.

chrome/browser/ui/views/certificate_selector.h

Index: chrome/browser/ui/views/certificate_selector.h
diff --git a/chrome/browser/ui/views/certificate_selector.h b/chrome/browser/ui/views/certificate_selector.h
index 5eb701a2287e5370db51f3151a33619944f490f3..91a202ae477dfb490a69baa872c796ebb08d0c55 100644
--- a/chrome/browser/ui/views/certificate_selector.h
+++ b/chrome/browser/ui/views/certificate_selector.h
@@ -9,7 +9,7 @@
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
-#include "net/cert/x509_certificate.h"
+#include "net/ssl/client_cert_identity.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/table/table_view_observer.h"
 #include "ui/views/window/dialog_delegate.h"
@@ -45,13 +45,13 @@ class CertificateSelector : public views::DialogDelegateView,
   static bool CanShow(content::WebContents* web_contents);
 
   // |web_contents| must not be null.
-  CertificateSelector(const net::CertificateList& certificates,
+  CertificateSelector(net::ClientCertIdentityList certificates,
                       content::WebContents* web_contents);
   ~CertificateSelector() override;
 
   // Returns the currently selected certificate or null if none is selected.
   // Must be called after |InitWithText()|.
-  net::X509Certificate* GetSelectedCert() const;
+  net::ClientCertIdentity* GetSelectedCert() const;
 
   // Shows this dialog as a constrained web modal dialog and focuses the first
   // certificate.
@@ -88,7 +88,7 @@ class CertificateSelector : public views::DialogDelegateView,
  private:
   class CertificateTableModel;
 
-  net::CertificateList certificates_;
+  net::ClientCertIdentityList certificates_;
 
   // Whether to show the provider column in the table or not. Certificates
   // provided by the platform show the empty string as provider. That column is