| Index: net/socket/websocket_transport_connect_sub_job.h
|
| diff --git a/net/socket/websocket_transport_connect_sub_job.h b/net/socket/websocket_transport_connect_sub_job.h
|
| index 36a4e943eb01184bdb224e0fd2e36a7da8aed533..f7ff53393c2dd0e573460107ae3980b2a94a865b 100644
|
| --- a/net/socket/websocket_transport_connect_sub_job.h
|
| +++ b/net/socket/websocket_transport_connect_sub_job.h
|
| @@ -6,11 +6,12 @@
|
| #define NET_SOCKET_WEBSOCKET_TRANSPORT_CONNECT_SUB_JOB_H_
|
|
|
| #include <stddef.h>
|
| +
|
| +#include <memory>
|
| #include <utility>
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "net/base/address_list.h"
|
| #include "net/base/load_states.h"
|
| #include "net/socket/websocket_endpoint_lock_manager.h"
|
| @@ -47,7 +48,9 @@ class WebSocketTransportConnectSubJob
|
|
|
| SubJobType type() const { return type_; }
|
|
|
| - scoped_ptr<StreamSocket> PassSocket() { return std::move(transport_socket_); }
|
| + std::unique_ptr<StreamSocket> PassSocket() {
|
| + return std::move(transport_socket_);
|
| + }
|
|
|
| // Implementation of WebSocketEndpointLockManager::EndpointWaiter.
|
| void GotEndpointLock() override;
|
| @@ -83,7 +86,7 @@ class WebSocketTransportConnectSubJob
|
| State next_state_;
|
| const SubJobType type_;
|
|
|
| - scoped_ptr<StreamSocket> transport_socket_;
|
| + std::unique_ptr<StreamSocket> transport_socket_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WebSocketTransportConnectSubJob);
|
| };
|
|
|