Refactor client cert private key handling.

chrome/browser/ui/views/ssl_client_certificate_selector.h

Index: chrome/browser/ui/views/ssl_client_certificate_selector.h
diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.h b/chrome/browser/ui/views/ssl_client_certificate_selector.h
index a65316d304f00743ab96b778ee0781351e2dcca2..773515a5f03e09da026b1077698337c0f17beed6 100644
--- a/chrome/browser/ui/views/ssl_client_certificate_selector.h
+++ b/chrome/browser/ui/views/ssl_client_certificate_selector.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_SSL_CLIENT_CERTIFICATE_SELECTOR_H_
 
 #include "base/macros.h"
+#include "base/memory/weak_ptr.h"
 #include "chrome/browser/ssl/ssl_client_auth_observer.h"
 #include "chrome/browser/ssl/ssl_client_certificate_selector.h"
 #include "chrome/browser/ui/views/certificate_selector.h"
@@ -31,7 +32,7 @@ class SSLClientCertificateSelector : public chrome::CertificateSelector,
   SSLClientCertificateSelector(
       content::WebContents* web_contents,
       const scoped_refptr<net::SSLCertRequestInfo>& cert_request_info,
-      net::CertificateList client_certs,
+      net::ClientCertIdentityList client_certs,
       std::unique_ptr<content::ClientCertificateDelegate> delegate);
   ~SSLClientCertificateSelector() override;
 
@@ -48,8 +49,11 @@ class SSLClientCertificateSelector : public chrome::CertificateSelector,
   void WebContentsDestroyed() override;
 
  private:
-  // Callback after unlocking certificate slot.
-  void Unlocked(net::X509Certificate* cert);
+  // Callback after retrieving private key.
+  void GotPrivateKey(net::X509Certificate* cert,
+                     scoped_refptr<net::SSLPrivateKey> private_key);
+
+  base::WeakPtrFactory<SSLClientCertificateSelector> weak_ptr_factory_;

[Peter Kasting, 2017/06/15 22:13:41]

Nit: Optionally, init here using "{this}" to avoid doing it in the .cc file. 
(Would be more compelling if there were more members or multiple constructors.)

[mattm, 2017/06/16 03:30:42]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(SSLClientCertificateSelector);
 };