| Index: net/socket/client_socket_handle.cc
|
| diff --git a/net/socket/client_socket_handle.cc b/net/socket/client_socket_handle.cc
|
| index 97b1b89d8445801ca498634872c3d080f4baeba7..0dc7b39309cfedafb6f12b9a47d1e4c549403a08 100644
|
| --- a/net/socket/client_socket_handle.cc
|
| +++ b/net/socket/client_socket_handle.cc
|
| @@ -136,7 +136,7 @@ bool ClientSocketHandle::GetLoadTimingInfo(
|
| return true;
|
| }
|
|
|
| -void ClientSocketHandle::SetSocket(scoped_ptr<StreamSocket> s) {
|
| +void ClientSocketHandle::SetSocket(std::unique_ptr<StreamSocket> s) {
|
| socket_ = std::move(s);
|
| }
|
|
|
| @@ -148,7 +148,7 @@ void ClientSocketHandle::OnIOComplete(int result) {
|
| callback.Run(result);
|
| }
|
|
|
| -scoped_ptr<StreamSocket> ClientSocketHandle::PassSocket() {
|
| +std::unique_ptr<StreamSocket> ClientSocketHandle::PassSocket() {
|
| return std::move(socket_);
|
| }
|
|
|
|
|