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

Unified Diff: net/socket/ssl_server_socket_openssl.cc

Issue 1545233002: Convert Pass()→std::move() in //net (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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_client_socket_unittest.cc ('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 548585856da184a3fef62b58780a00352dd01337..014cfe6dfab72e9abcf76c2299a143dbafa1488a 100644
--- a/net/socket/ssl_server_socket_openssl.cc
+++ b/net/socket/ssl_server_socket_openssl.cc
@@ -6,6 +6,7 @@
#include <openssl/err.h>
#include <openssl/ssl.h>
+#include <utility>
#include "base/callback_helpers.h"
#include "base/logging.h"
@@ -31,8 +32,8 @@ scoped_ptr<SSLServerSocket> CreateSSLServerSocket(
crypto::RSAPrivateKey* key,
const SSLServerConfig& ssl_config) {
crypto::EnsureOpenSSLInit();
- return scoped_ptr<SSLServerSocket>(
- new SSLServerSocketOpenSSL(socket.Pass(), certificate, key, ssl_config));
+ return scoped_ptr<SSLServerSocket>(new SSLServerSocketOpenSSL(
+ std::move(socket), certificate, key, ssl_config));
}
SSLServerSocketOpenSSL::SSLServerSocketOpenSSL(
@@ -48,7 +49,7 @@ SSLServerSocketOpenSSL::SSLServerSocketOpenSSL(
transport_write_error_(OK),
ssl_(NULL),
transport_bio_(NULL),
- transport_socket_(transport_socket.Pass()),
+ transport_socket_(std::move(transport_socket)),
ssl_config_(ssl_config),
cert_(certificate),
next_handshake_state_(STATE_NONE),
« no previous file with comments | « net/socket/ssl_client_socket_unittest.cc ('k') | net/socket/ssl_server_socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698