Convert //remoting to use std::unique_ptr

remoting/protocol/pseudotcp_channel_factory.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/protocol/pseudotcp_channel_factory.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "net/base/net_errors.h"
@@ skipping 43 matching lines @@
     datagram_channel_factory_->CancelChannelCreation(name);
   } else {
     delete it->second;
     pending_sockets_.erase(it);
   }
 }
 
 void PseudoTcpChannelFactory::OnDatagramChannelCreated(
     const std::string& name,
     const ChannelCreatedCallback& callback,
-    scoped_ptr<P2PDatagramSocket> datagram_socket) {
+    std::unique_ptr<P2PDatagramSocket> datagram_socket) {
   PseudoTcpAdapter* adapter = new PseudoTcpAdapter(std::move(datagram_socket));
   pending_sockets_[name] = adapter;
 
   adapter->SetSendBufferSize(kTcpSendBufferSize);
   adapter->SetReceiveBufferSize(kTcpReceiveBufferSize);
   adapter->SetNoDelay(true);
   adapter->SetAckDelay(kTcpAckDelayMilliseconds);
 
   // TODO(sergeyu): This is a hack to improve latency of the video channel.
   // Consider removing it once we have better flow control implemented.
   if (name == kVideoChannelName)
     adapter->SetWriteWaitsForSend(true);
 
   int result = adapter->Connect(
       base::Bind(&PseudoTcpChannelFactory::OnPseudoTcpConnected,
                  base::Unretained(this), name, callback));
   if (result != net::ERR_IO_PENDING)
     OnPseudoTcpConnected(name, callback, result);
 }
 
 void PseudoTcpChannelFactory::OnPseudoTcpConnected(
     const std::string& name,
     const ChannelCreatedCallback& callback,
     int result) {
   PendingSocketsMap::iterator it = pending_sockets_.find(name);
   DCHECK(it != pending_sockets_.end());
-  scoped_ptr<P2PStreamSocket> socket(it->second);
+  std::unique_ptr<P2PStreamSocket> socket(it->second);
   pending_sockets_.erase(it);
 
   if (result != net::OK)
     socket.reset();
 
   callback.Run(std::move(socket));
 }
 
 }  // namespace protocol
 }  // namespace remoting