Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(217)

Unified Diff: net/socket/ssl_server_socket_openssl.cc

Issue 1892323002: Change scoped_ptr to std::unique_ptr in //net/socket. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/ssl_server_socket_openssl.h ('k') | net/socket/ssl_server_socket_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_server_socket_openssl.cc
diff --git a/net/socket/ssl_server_socket_openssl.cc b/net/socket/ssl_server_socket_openssl.cc
index 74f223131d87b04652b524bc57eb681f590d1098..d931c5c361fd5823f3c73cb79cab2cfbe2310438 100644
--- a/net/socket/ssl_server_socket_openssl.cc
+++ b/net/socket/ssl_server_socket_openssl.cc
@@ -55,7 +55,7 @@ class SSLServerSocketOpenSSL : public SSLServerSocket {
public:
// See comments on CreateSSLServerSocket for details of how these
// parameters are used.
- SSLServerSocketOpenSSL(scoped_ptr<StreamSocket> socket, SSL* ssl);
+ SSLServerSocketOpenSSL(std::unique_ptr<StreamSocket> socket, SSL* ssl);
~SSLServerSocketOpenSSL() override;
// SSLServerSocket interface.
@@ -160,7 +160,7 @@ class SSLServerSocketOpenSSL : public SSLServerSocket {
BIO* transport_bio_;
// StreamSocket for sending and receiving data.
- scoped_ptr<StreamSocket> transport_socket_;
+ std::unique_ptr<StreamSocket> transport_socket_;
// Certificate for the client.
scoped_refptr<X509Certificate> client_cert_;
@@ -172,7 +172,7 @@ class SSLServerSocketOpenSSL : public SSLServerSocket {
};
SSLServerSocketOpenSSL::SSLServerSocketOpenSSL(
- scoped_ptr<StreamSocket> transport_socket,
+ std::unique_ptr<StreamSocket> transport_socket,
SSL* ssl)
: transport_send_busy_(false),
transport_recv_busy_(false),
@@ -805,7 +805,7 @@ int SSLServerSocketOpenSSL::CertVerifyCallback(X509_STORE_CTX* store_ctx,
// http://crbug.com/347402
// The API for Verify supports the parts needed for async completion
// but is currently expected to complete synchronously.
- scoped_ptr<ClientCertVerifier::Request> ignore_async;
+ std::unique_ptr<ClientCertVerifier::Request> ignore_async;
int res =
verifier->Verify(client_cert.get(), CompletionCallback(), &ignore_async);
DCHECK_NE(res, ERR_IO_PENDING);
@@ -819,11 +819,11 @@ int SSLServerSocketOpenSSL::CertVerifyCallback(X509_STORE_CTX* store_ctx,
} // namespace
-scoped_ptr<SSLServerContext> CreateSSLServerContext(
+std::unique_ptr<SSLServerContext> CreateSSLServerContext(
X509Certificate* certificate,
const crypto::RSAPrivateKey& key,
const SSLServerConfig& ssl_server_config) {
- return scoped_ptr<SSLServerContext>(
+ return std::unique_ptr<SSLServerContext>(
new SSLServerContextOpenSSL(certificate, key, ssl_server_config));
}
@@ -943,10 +943,10 @@ SSLServerContextOpenSSL::SSLServerContextOpenSSL(
SSLServerContextOpenSSL::~SSLServerContextOpenSSL() {}
-scoped_ptr<SSLServerSocket> SSLServerContextOpenSSL::CreateSSLServerSocket(
- scoped_ptr<StreamSocket> socket) {
+std::unique_ptr<SSLServerSocket> SSLServerContextOpenSSL::CreateSSLServerSocket(
+ std::unique_ptr<StreamSocket> socket) {
SSL* ssl = SSL_new(ssl_ctx_.get());
- return scoped_ptr<SSLServerSocket>(
+ return std::unique_ptr<SSLServerSocket>(
new SSLServerSocketOpenSSL(std::move(socket), ssl));
}
« no previous file with comments | « net/socket/ssl_server_socket_openssl.h ('k') | net/socket/ssl_server_socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698