| Index: net/ssl/ssl_platform_key_chromecast.cc
|
| diff --git a/net/ssl/ssl_platform_key_chromecast.cc b/net/ssl/ssl_platform_key_chromecast.cc
|
| index ef1fef56e60f63e5ec57b8d4e9a60122601fb8ce..6ee005de84acdba704d4754565cf61c5a7d76f74 100644
|
| --- a/net/ssl/ssl_platform_key_chromecast.cc
|
| +++ b/net/ssl/ssl_platform_key_chromecast.cc
|
| @@ -2,21 +2,20 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "net/ssl/ssl_platform_key.h"
|
| -
|
| #include <keyhi.h>
|
| +#include <openssl/rsa.h>
|
| #include <pk11pub.h>
|
| #include <prerror.h>
|
|
|
| -#include <openssl/rsa.h>
|
| -
|
| #include "base/logging.h"
|
| #include "base/macros.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/sequenced_task_runner.h"
|
| #include "crypto/scoped_nss_types.h"
|
| #include "crypto/scoped_openssl_types.h"
|
| #include "net/cert/x509_certificate.h"
|
| #include "net/ssl/client_key_store.h"
|
| +#include "net/ssl/ssl_platform_key.h"
|
| #include "net/ssl/ssl_platform_key_task_runner.h"
|
| #include "net/ssl/ssl_private_key.h"
|
| #include "net/ssl/threaded_ssl_private_key.h"
|
| @@ -129,7 +128,7 @@ scoped_refptr<SSLPrivateKey> FetchClientCertPrivateKey(
|
| }
|
|
|
| return make_scoped_refptr(new ThreadedSSLPrivateKey(
|
| - make_scoped_ptr(new SSLPlatformKeyChromecast(std::move(key))),
|
| + base::WrapUnique(new SSLPlatformKeyChromecast(std::move(key))),
|
| GetSSLPlatformKeyTaskRunner()));
|
| }
|
|
|
|
|