Index: net/socket/tcp_client_socket.h |
diff --git a/net/socket/tcp_client_socket.h b/net/socket/tcp_client_socket.h |
index ddda0a6431f867965478ab794433541f951052b1..bf41545d180e3139783aaf60f722cdfc4848aa15 100644 |
--- a/net/socket/tcp_client_socket.h |
+++ b/net/socket/tcp_client_socket.h |
@@ -7,9 +7,10 @@ |
#include <stdint.h> |
+#include <memory> |
+ |
#include "base/compiler_specific.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "net/base/address_list.h" |
#include "net/base/completion_callback.h" |
#include "net/base/net_export.h" |
@@ -30,13 +31,13 @@ class NET_EXPORT TCPClientSocket : public StreamSocket { |
// connection. |
TCPClientSocket( |
const AddressList& addresses, |
- scoped_ptr<SocketPerformanceWatcher> socket_performance_watcher, |
+ std::unique_ptr<SocketPerformanceWatcher> socket_performance_watcher, |
net::NetLog* net_log, |
const net::NetLog::Source& source); |
// Adopts the given, connected socket and then acts as if Connect() had been |
// called. This function is used by TCPServerSocket and for testing. |
- TCPClientSocket(scoped_ptr<TCPSocket> connected_socket, |
+ TCPClientSocket(std::unique_ptr<TCPSocket> connected_socket, |
const IPEndPoint& peer_address); |
~TCPClientSocket() override; |
@@ -115,11 +116,11 @@ class NET_EXPORT TCPClientSocket : public StreamSocket { |
// is destroyed. |
SocketPerformanceWatcher* socket_performance_watcher_; |
- scoped_ptr<TCPSocket> socket_; |
+ std::unique_ptr<TCPSocket> socket_; |
// Local IP address and port we are bound to. Set to NULL if Bind() |
// wasn't called (in that case OS chooses address/port). |
- scoped_ptr<IPEndPoint> bind_address_; |
+ std::unique_ptr<IPEndPoint> bind_address_; |
// The list of addresses we should try in order to establish a connection. |
AddressList addresses_; |