Index: net/socket/socks_client_socket.h |
diff --git a/net/socket/socks_client_socket.h b/net/socket/socks_client_socket.h |
index c01156050a48940e0f1199795b286ea441c3b9d3..d6702631c998ab9118c2f213e984dfd3c6ae5426 100644 |
--- a/net/socket/socks_client_socket.h |
+++ b/net/socket/socks_client_socket.h |
@@ -8,12 +8,12 @@ |
#include <stddef.h> |
#include <stdint.h> |
+#include <memory> |
#include <string> |
#include "base/gtest_prod_util.h" |
#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
-#include "base/memory/scoped_ptr.h" |
#include "net/base/address_list.h" |
#include "net/base/completion_callback.h" |
#include "net/base/net_errors.h" |
@@ -32,7 +32,7 @@ class NET_EXPORT_PRIVATE SOCKSClientSocket : public StreamSocket { |
public: |
// |req_info| contains the hostname and port to which the socket above will |
// communicate to via the socks layer. For testing the referrer is optional. |
- SOCKSClientSocket(scoped_ptr<ClientSocketHandle> transport_socket, |
+ SOCKSClientSocket(std::unique_ptr<ClientSocketHandle> transport_socket, |
const HostResolver::RequestInfo& req_info, |
RequestPriority priority, |
HostResolver* host_resolver); |
@@ -103,7 +103,7 @@ class NET_EXPORT_PRIVATE SOCKSClientSocket : public StreamSocket { |
const std::string BuildHandshakeWriteBuffer() const; |
// Stores the underlying socket. |
- scoped_ptr<ClientSocketHandle> transport_; |
+ std::unique_ptr<ClientSocketHandle> transport_; |
State next_state_; |