| Index: net/socket/client_socket_factory.cc
|
| diff --git a/net/socket/client_socket_factory.cc b/net/socket/client_socket_factory.cc
|
| index e0bc81d5e3430ad2253fbacd6389192edfbd4858..cc2a243c91aa2494a33337010b2c98a8c02d4ebc 100644
|
| --- a/net/socket/client_socket_factory.cc
|
| +++ b/net/socket/client_socket_factory.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "net/socket/client_socket_factory.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/lazy_instance.h"
|
| #include "build/build_config.h"
|
| #include "net/cert/cert_database.h"
|
| @@ -70,9 +72,8 @@ class DefaultClientSocketFactory : public ClientSocketFactory,
|
| const SSLConfig& ssl_config,
|
| const SSLClientSocketContext& context) override {
|
| #if defined(USE_OPENSSL)
|
| - return scoped_ptr<SSLClientSocket>(
|
| - new SSLClientSocketOpenSSL(transport_socket.Pass(), host_and_port,
|
| - ssl_config, context));
|
| + return scoped_ptr<SSLClientSocket>(new SSLClientSocketOpenSSL(
|
| + 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));
|
|
|