Index: net/socket/transport_client_socket_pool_test_util.h |
diff --git a/net/socket/transport_client_socket_pool_test_util.h b/net/socket/transport_client_socket_pool_test_util.h |
index efab9d359822eb392679afbd63cf41d3a820c565..679fb1724fd73c2f61a23d0b8d28d487664d57ff 100644 |
--- a/net/socket/transport_client_socket_pool_test_util.h |
+++ b/net/socket/transport_client_socket_pool_test_util.h |
@@ -9,12 +9,12 @@ |
#ifndef NET_SOCKET_TRANSPORT_CLIENT_SOCKET_POOL_TEST_UTIL_H_ |
#define NET_SOCKET_TRANSPORT_CLIENT_SOCKET_POOL_TEST_UTIL_H_ |
+#include <memory> |
#include <queue> |
#include "base/callback.h" |
#include "base/compiler_specific.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/time/time.h" |
#include "net/base/address_list.h" |
#include "net/base/socket_performance_watcher.h" |
@@ -73,20 +73,21 @@ class MockTransportClientSocketFactory : public ClientSocketFactory { |
explicit MockTransportClientSocketFactory(NetLog* net_log); |
~MockTransportClientSocketFactory() override; |
- scoped_ptr<DatagramClientSocket> CreateDatagramClientSocket( |
+ std::unique_ptr<DatagramClientSocket> CreateDatagramClientSocket( |
DatagramSocket::BindType bind_type, |
const RandIntCallback& rand_int_cb, |
NetLog* net_log, |
const NetLog::Source& source) override; |
- scoped_ptr<StreamSocket> CreateTransportClientSocket( |
+ std::unique_ptr<StreamSocket> CreateTransportClientSocket( |
const AddressList& addresses, |
- scoped_ptr<SocketPerformanceWatcher> /* socket_performance_watcher */, |
+ std::unique_ptr< |
+ SocketPerformanceWatcher> /* socket_performance_watcher */, |
NetLog* /* net_log */, |
const NetLog::Source& /* source */) override; |
- scoped_ptr<SSLClientSocket> CreateSSLClientSocket( |
- scoped_ptr<ClientSocketHandle> transport_socket, |
+ std::unique_ptr<SSLClientSocket> CreateSSLClientSocket( |
+ std::unique_ptr<ClientSocketHandle> transport_socket, |
const HostPortPair& host_and_port, |
const SSLConfig& ssl_config, |
const SSLClientSocketContext& context) override; |