| Index: remoting/protocol/pseudotcp_channel_factory.cc
|
| diff --git a/remoting/protocol/pseudotcp_channel_factory.cc b/remoting/protocol/pseudotcp_channel_factory.cc
|
| index 432a2a92967261882dd66c7f48b2b275edc4f07c..5f54a8d41f935ef80fef715464111f7e3e5d4e41 100644
|
| --- a/remoting/protocol/pseudotcp_channel_factory.cc
|
| +++ b/remoting/protocol/pseudotcp_channel_factory.cc
|
| @@ -60,7 +60,7 @@ void PseudoTcpChannelFactory::OnDatagramChannelCreated(
|
| const std::string& name,
|
| const ChannelCreatedCallback& callback,
|
| scoped_ptr<P2PDatagramSocket> datagram_socket) {
|
| - PseudoTcpAdapter* adapter = new PseudoTcpAdapter(datagram_socket.Pass());
|
| + PseudoTcpAdapter* adapter = new PseudoTcpAdapter(std::move(datagram_socket));
|
| pending_sockets_[name] = adapter;
|
|
|
| adapter->SetSendBufferSize(kTcpSendBufferSize);
|
| @@ -92,7 +92,7 @@ void PseudoTcpChannelFactory::OnPseudoTcpConnected(
|
| if (result != net::OK)
|
| socket.reset();
|
|
|
| - callback.Run(socket.Pass());
|
| + callback.Run(std::move(socket));
|
| }
|
|
|
| } // namespace protocol
|
|
|