Refactor client cert private key handling.

chromecast/browser/cast_content_browser_client.h

 // Copyright 2014 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 CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_
 #define CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_
 
 #include <map>
 #include <memory>
 #include <string>
@@ skipping 12 matching lines @@
 
 namespace breakpad {
 class CrashHandlerHostLinux;
 }
 
 namespace metrics {
 class MetricsService;
 }
 
 namespace net {
+class SSLPrivateKey;
 class URLRequestContextGetter;
 class X509Certificate;
 }
 
 namespace service_manager {
 class BinderRegistry;
 }
 
 namespace chromecast {
 class CastService;
@@ skipping 98 matching lines @@
       const GURL& request_url,
       content::ResourceType resource_type,
       bool overridable,
       bool strict_enforcement,
       bool expired_previous_decision,
       const base::Callback<void(content::CertificateRequestResultType)>&
           callback) override;
   void SelectClientCertificate(
       content::WebContents* web_contents,
       net::SSLCertRequestInfo* cert_request_info,
-      net::CertificateList client_certs,
+      net::ClientCertIdentityList client_certs,
       std::unique_ptr<content::ClientCertificateDelegate> delegate) override;
   bool CanCreateWindow(content::RenderFrameHost* opener,
                        const GURL& opener_url,
                        const GURL& opener_top_level_frame_url,
                        const GURL& source_origin,
                        content::mojom::WindowContainerType container_type,
                        const GURL& target_url,
                        const content::Referrer& referrer,
                        const std::string& frame_name,
                        WindowOpenDisposition disposition,
@@ skipping 20 matching lines @@
   CastContentBrowserClient();
 
   URLRequestContextFactory* url_request_context_factory() const {
     return url_request_context_factory_.get();
   }
 
  private:
   void AddNetworkHintsMessageFilter(int render_process_id,
                                     net::URLRequestContext* context);
 
-  net::X509Certificate* SelectClientCertificateOnIOThread(
+  void SelectClientCertificateOnIOThread(
       GURL requesting_url,
-      int render_process_id);
-
+      int render_process_id,
+      scoped_refptr<base::SequencedTaskRunner> original_runner,
+      const base::Callback<void(scoped_refptr<net::X509Certificate>,
+                                scoped_refptr<net::SSLPrivateKey>)>&
+          continue_callback);
 #if !defined(OS_ANDROID)
   // Returns the crash signal FD corresponding to the current process type.
   int GetCrashSignalFD(const base::CommandLine& command_line);
 
   // Creates a CrashHandlerHost instance for the given process type.
   breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
       const std::string& process_type);
 
   // A static cache to hold crash_handlers for each process_type
   std::map<std::string, breakpad::CrashHandlerHostLinux*> crash_handlers_;
 #endif  // !defined(OS_ANDROID)
 
   // Created by CastContentBrowserClient but owned by BrowserMainLoop.
   CastBrowserMainParts* cast_browser_main_parts_;
   std::unique_ptr<URLRequestContextFactory> url_request_context_factory_;
   std::unique_ptr<CastResourceDispatcherHostDelegate>
       resource_dispatcher_host_delegate_;
   std::unique_ptr<media::MediaPipelineBackendFactory>
       media_pipeline_backend_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CastContentBrowserClient);
 };
 
 }  // namespace shell
 }  // namespace chromecast
 
 #endif  // CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_