| Index: net/socket/ssl_client_socket_nss.h
|
| diff --git a/net/socket/ssl_client_socket_nss.h b/net/socket/ssl_client_socket_nss.h
|
| index 7073290a791dd182a2669d6515d2cc6c81e87e4b..c96fc4199217f7c888965ebf59b781af4aab4568 100644
|
| --- a/net/socket/ssl_client_socket_nss.h
|
| +++ b/net/socket/ssl_client_socket_nss.h
|
| @@ -11,10 +11,10 @@
|
| #include <nss.h>
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/synchronization/lock.h"
|
| #include "base/threading/platform_thread.h"
|
| #include "base/time/time.h"
|
| @@ -51,7 +51,7 @@ class SSLClientSocketNSS : public SSLClientSocket {
|
| // authentication is requested, the host_and_port field of SSLCertRequestInfo
|
| // will be populated with |host_and_port|. |ssl_config| specifies
|
| // the SSL settings.
|
| - SSLClientSocketNSS(scoped_ptr<ClientSocketHandle> transport_socket,
|
| + SSLClientSocketNSS(std::unique_ptr<ClientSocketHandle> transport_socket,
|
| const HostPortPair& host_and_port,
|
| const SSLConfig& ssl_config,
|
| const SSLClientSocketContext& context);
|
| @@ -153,7 +153,7 @@ class SSLClientSocketNSS : public SSLClientSocket {
|
| // uses the first one as a fallback for NPN.
|
| static void ReorderNextProtos(NextProtoVector* next_protos);
|
|
|
| - scoped_ptr<ClientSocketHandle> transport_;
|
| + std::unique_ptr<ClientSocketHandle> transport_;
|
| HostPortPair host_and_port_;
|
| SSLConfig ssl_config_;
|
|
|
| @@ -164,7 +164,7 @@ class SSLClientSocketNSS : public SSLClientSocket {
|
| CertVerifyResult server_cert_verify_result_;
|
|
|
| CertVerifier* const cert_verifier_;
|
| - scoped_ptr<CertVerifier::Request> cert_verifier_request_;
|
| + std::unique_ptr<CertVerifier::Request> cert_verifier_request_;
|
|
|
| // Certificate Transparency: Verifier and result holder.
|
| ct::CTVerifyResult ct_verify_result_;
|
|
|