| Index: net/socket/ssl_client_socket_pool.cc
|
| diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc
|
| index 0fdfc406514cec8d529bc024c62af91ac9219a10..303bb8630737ce964e8ca8af90f3bd91093302ee 100644
|
| --- a/net/socket/ssl_client_socket_pool.cc
|
| +++ b/net/socket/ssl_client_socket_pool.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "net/socket/ssl_client_socket_pool.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| #include "base/metrics/field_trial.h"
|
| @@ -319,10 +321,8 @@ int SSLConnectJob::DoSSLConnect() {
|
| connect_timing_.ssl_start = base::TimeTicks::Now();
|
|
|
| ssl_socket_ = client_socket_factory_->CreateSSLClientSocket(
|
| - transport_socket_handle_.Pass(),
|
| - params_->host_and_port(),
|
| - params_->ssl_config(),
|
| - context_);
|
| + std::move(transport_socket_handle_), params_->host_and_port(),
|
| + params_->ssl_config(), context_);
|
| return ssl_socket_->Connect(callback_);
|
| }
|
|
|
| @@ -440,7 +440,7 @@ int SSLConnectJob::DoSSLConnectComplete(int result) {
|
| UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSL_Connection_Error", std::abs(result));
|
|
|
| if (result == OK || IsCertificateError(result)) {
|
| - SetSocket(ssl_socket_.Pass());
|
| + SetSocket(std::move(ssl_socket_));
|
| } else if (result == ERR_SSL_CLIENT_AUTH_CERT_NEEDED) {
|
| error_response_info_.cert_request_info = new SSLCertRequestInfo;
|
| ssl_socket_->GetSSLCertRequestInfo(
|
| @@ -608,7 +608,7 @@ void SSLClientSocketPool::CancelRequest(const std::string& group_name,
|
| void SSLClientSocketPool::ReleaseSocket(const std::string& group_name,
|
| scoped_ptr<StreamSocket> socket,
|
| int id) {
|
| - base_.ReleaseSocket(group_name, socket.Pass(), id);
|
| + base_.ReleaseSocket(group_name, std::move(socket), id);
|
| }
|
|
|
| void SSLClientSocketPool::FlushWithError(int error) {
|
| @@ -657,7 +657,7 @@ scoped_ptr<base::DictionaryValue> SSLClientSocketPool::GetInfoAsValue(
|
| }
|
| dict->Set("nested_pools", list);
|
| }
|
| - return dict.Pass();
|
| + return dict;
|
| }
|
|
|
| base::TimeDelta SSLClientSocketPool::ConnectionTimeout() const {
|
|
|