diff options
| author | dcheng <dcheng@chromium.org> | 2016-01-13 20:41:45 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-14 04:43:33 +0000 |
| commit | 5e05b437032ffeb7bf9da7dcf1355fc668a33a9d (patch) | |
| tree | 5ce11c333ab085b2bb85cb8c989225f504c0c293 /net/socket | |
| parent | e8ecfb59d4f906e0ab40b6046406b8af1366cb10 (diff) | |
| download | chromium_src-5e05b437032ffeb7bf9da7dcf1355fc668a33a9d.zip chromium_src-5e05b437032ffeb7bf9da7dcf1355fc668a33a9d.tar.gz chromium_src-5e05b437032ffeb7bf9da7dcf1355fc668a33a9d.tar.bz2 | |
Convert Pass()→std::move() for iOS build.
BUG=557422
R=rickyz@chromium.org
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/1586833002
Cr-Commit-Position: refs/heads/master@{#369328}
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/client_socket_factory.cc | 2 | ||||
| -rw-r--r-- | net/socket/nss_ssl_util.cc | 5 | ||||
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 3 | ||||
| -rw-r--r-- | net/socket/ssl_server_socket_nss.cc | 6 |
4 files changed, 10 insertions, 6 deletions
diff --git a/net/socket/client_socket_factory.cc b/net/socket/client_socket_factory.cc index cc2a243..311f926 100644 --- a/net/socket/client_socket_factory.cc +++ b/net/socket/client_socket_factory.cc @@ -76,7 +76,7 @@ class DefaultClientSocketFactory : public ClientSocketFactory, std::move(transport_socket), host_and_port, ssl_config, context)); #else return scoped_ptr<SSLClientSocket>(new SSLClientSocketNSS( - transport_socket.Pass(), host_and_port, ssl_config, context)); + std::move(transport_socket), host_and_port, ssl_config, context)); #endif } diff --git a/net/socket/nss_ssl_util.cc b/net/socket/nss_ssl_util.cc index 74b4d41..ee58757 100644 --- a/net/socket/nss_ssl_util.cc +++ b/net/socket/nss_ssl_util.cc @@ -11,6 +11,7 @@ #include <sslproto.h> #include <string> +#include <utility> #include "base/bind.h" #include "base/cpu.h" @@ -87,7 +88,7 @@ scoped_ptr<base::Value> NetLogSSLErrorCallback( dict->SetInteger("net_error", net_error); if (ssl_lib_error) dict->SetInteger("ssl_lib_error", ssl_lib_error); - return dict.Pass(); + return std::move(dict); } class NSSSSLInitSingleton { @@ -388,7 +389,7 @@ scoped_ptr<base::Value> NetLogSSLFailedNSSFunctionCallback( if (param[0] != '\0') dict->SetString("param", param); dict->SetInteger("ssl_lib_error", ssl_lib_error); - return dict.Pass(); + return std::move(dict); } void LogFailedNSSFunction(const BoundNetLog& net_log, diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index fcd8739..b15d761 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -63,6 +63,7 @@ #include <algorithm> #include <limits> #include <map> +#include <utility> #include "base/bind.h" #include "base/bind_helpers.h" @@ -2359,7 +2360,7 @@ SSLClientSocketNSS::SSLClientSocketNSS( const HostPortPair& host_and_port, const SSLConfig& ssl_config, const SSLClientSocketContext& context) - : transport_(transport_socket.Pass()), + : transport_(std::move(transport_socket)), host_and_port_(host_and_port), ssl_config_(ssl_config), cert_verifier_(context.cert_verifier), diff --git a/net/socket/ssl_server_socket_nss.cc b/net/socket/ssl_server_socket_nss.cc index a676aa0..80450fe 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()), |