| Index: chromecast/browser/cast_content_browser_client.h
|
| diff --git a/chromecast/browser/cast_content_browser_client.h b/chromecast/browser/cast_content_browser_client.h
|
| index 27a6447bbc1eb8df997e0bb8ff2c53b1391ce31b..1df8706ef0cff7e9250e5a4299818c5fcb61b0f7 100644
|
| --- a/chromecast/browser/cast_content_browser_client.h
|
| +++ b/chromecast/browser/cast_content_browser_client.h
|
| @@ -30,6 +30,7 @@ class MetricsService;
|
| }
|
|
|
| namespace net {
|
| +class SSLPrivateKey;
|
| class URLRequestContextGetter;
|
| class X509Certificate;
|
| }
|
| @@ -148,7 +149,7 @@ class CastContentBrowserClient : public content::ContentBrowserClient {
|
| 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,
|
| @@ -189,10 +190,13 @@ class CastContentBrowserClient : public content::ContentBrowserClient {
|
| 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);
|
|
|