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

Unified Diff: net/socket/ssl_server_socket_nss.cc

Issue 1586833002: Convert Pass()→std::move() for iOS build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert accidental //base change Created 4 years, 11 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_client_socket_nss.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_server_socket_nss.cc
diff --git a/net/socket/ssl_server_socket_nss.cc b/net/socket/ssl_server_socket_nss.cc
index a676aa0511205b1af67777743f73653c6fc48e28..80450fe65face23a5bc64bd64538662ebf4a16f5 100644
--- a/net/socket/ssl_server_socket_nss.cc
+++ b/net/socket/ssl_server_socket_nss.cc
@@ -4,6 +4,8 @@
#include "net/socket/ssl_server_socket_nss.h"
+#include <utility>
+
#if defined(OS_WIN)
#include <winsock2.h>
#endif
@@ -88,7 +90,7 @@ scoped_ptr<SSLServerSocket> CreateSSLServerSocket(
<< " called yet!";
return scoped_ptr<SSLServerSocket>(
- new SSLServerSocketNSS(socket.Pass(), cert, key, ssl_config));
+ new SSLServerSocketNSS(std::move(socket), cert, key, ssl_config));
}
SSLServerSocketNSS::SSLServerSocketNSS(
@@ -102,7 +104,7 @@ SSLServerSocketNSS::SSLServerSocketNSS(
user_write_buf_len_(0),
nss_fd_(NULL),
nss_bufs_(NULL),
- transport_socket_(transport_socket.Pass()),
+ transport_socket_(std::move(transport_socket)),
ssl_config_(ssl_config),
cert_(cert),
key_(key.Copy()),
« no previous file with comments | « net/socket/ssl_client_socket_nss.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698