| Index: net/socket/socks5_client_socket.h
|
| diff --git a/net/socket/socks5_client_socket.h b/net/socket/socks5_client_socket.h
|
| index 4d3d6dbcf1dd7177ec8a55865ea6543a5e83bd7c..c65ddc28f93e48fdb05b040a1c4605d5c832e1d4 100644
|
| --- a/net/socket/socks5_client_socket.h
|
| +++ b/net/socket/socks5_client_socket.h
|
| @@ -8,11 +8,11 @@
|
| #include <stddef.h>
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #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"
|
| @@ -36,7 +36,7 @@ class NET_EXPORT_PRIVATE SOCKS5ClientSocket : public StreamSocket {
|
| // Although SOCKS 5 supports 3 different modes of addressing, we will
|
| // always pass it a hostname. This means the DNS resolving is done
|
| // proxy side.
|
| - SOCKS5ClientSocket(scoped_ptr<ClientSocketHandle> transport_socket,
|
| + SOCKS5ClientSocket(std::unique_ptr<ClientSocketHandle> transport_socket,
|
| const HostResolver::RequestInfo& req_info);
|
|
|
| // On destruction Disconnect() is called.
|
| @@ -123,7 +123,7 @@ class NET_EXPORT_PRIVATE SOCKS5ClientSocket : public StreamSocket {
|
| CompletionCallback io_callback_;
|
|
|
| // Stores the underlying socket.
|
| - scoped_ptr<ClientSocketHandle> transport_;
|
| + std::unique_ptr<ClientSocketHandle> transport_;
|
|
|
| State next_state_;
|
|
|
|
|