Refactor client cert private key handling.

content/public/browser/content_browser_client.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
 
 #include <stddef.h>
 
 #include <map>
@@ skipping 55 matching lines @@
 class CdmFactory;
 }
 
 namespace service_manager {
 class BinderRegistry;
 class Service;
 struct BindSourceInfo;
 }
 
 namespace net {
+class ClientCertIdentity;
+using ClientCertIdentityList = std::vector<std::unique_ptr<ClientCertIdentity>>;

[davidben, 2017/06/01 23:41:25]

Do we still like to do this kind of forward decl? I thought we usually just give
up an #include the headers for this.

[mattm, 2017/06/02 04:04:20]

I think I did do that in most places, but since content_browser_client.h gets
included so many places I thought maybe it was worth doing here. Fine with just
doing the include too though, if you want.

 class CookieOptions;
 class NetLog;
 class SSLCertRequestInfo;
 class SSLInfo;
 class URLRequest;
 class URLRequestContext;
-class X509Certificate;
-typedef std::vector<scoped_refptr<X509Certificate>> CertificateList;
 }
 
 namespace rappor {
 class RapporService;
 }
 
 namespace ukm {
 class UkmRecorder;
 }
 
@@ skipping 381 matching lines @@
       bool expired_previous_decision,
       const base::Callback<void(CertificateRequestResultType)>& callback);
 
   // Selects a SSL client certificate and returns it to the |delegate|. Note:
   // |delegate| may be called synchronously or asynchronously.
   //
   // TODO(davidben): Move this hook to WebContentsDelegate.
   virtual void SelectClientCertificate(
       WebContents* web_contents,
       net::SSLCertRequestInfo* cert_request_info,
-      net::CertificateList client_certs,
+      net::ClientCertIdentityList client_certs,
       std::unique_ptr<ClientCertificateDelegate> delegate);
 
   // Returns a class to get notifications about media event. The embedder can
   // return nullptr if they're not interested.
   virtual MediaObserver* GetMediaObserver();
 
   // Returns the platform notification service, capable of displaying Web
   // Notifications to the user. The embedder can return a nullptr if they don't
   // support this functionality. May be called from any thread.
   virtual PlatformNotificationService* GetPlatformNotificationService();
@@ skipping 324 matching lines @@
   virtual bool ShouldRedirectDOMStorageTaskRunner();
 
   // If this returns true, all BrowserThreads (but UI/IO) that support it on
   // this platform will experimentally be redirected to TaskScheduler.
   virtual bool RedirectNonUINonIOBrowserThreadsToTaskScheduler();
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_