Convert //remoting to use std::unique_ptr

remoting/protocol/stream_message_pipe_adapter.cc

 // Copyright 2016 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/stream_message_pipe_adapter.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
+#include "base/memory/ptr_util.h"
 #include "net/base/net_errors.h"
 #include "remoting/base/buffered_socket_writer.h"
 #include "remoting/base/compound_buffer.h"
 #include "remoting/protocol/message_serialization.h"
 #include "remoting/protocol/p2p_stream_socket.h"
 #include "remoting/protocol/stream_channel_factory.h"
 
 namespace remoting {
 namespace protocol {
 
 StreamMessagePipeAdapter::StreamMessagePipeAdapter(
-    scoped_ptr<P2PStreamSocket> socket,
+    std::unique_ptr<P2PStreamSocket> socket,
     const ErrorCallback& error_callback)
     : socket_(std::move(socket)),
       error_callback_(error_callback),
       writer_(new BufferedSocketWriter()) {
   DCHECK(socket_);
   DCHECK(!error_callback_.is_null());
 
   writer_->Start(
       base::Bind(&P2PStreamSocket::Write, base::Unretained(socket_.get())),
       base::Bind(&StreamMessagePipeAdapter::CloseOnError,
@@ skipping 39 matching lines @@
                        base::Unretained(this), callback));
 }
 
 void StreamMessageChannelFactoryAdapter::CancelChannelCreation(
     const std::string& name) {
   stream_channel_factory_->CancelChannelCreation(name);
 }
 
 void StreamMessageChannelFactoryAdapter::OnChannelCreated(
     const ChannelCreatedCallback& callback,
-    scoped_ptr<P2PStreamSocket> socket) {
+    std::unique_ptr<P2PStreamSocket> socket) {
   if (!socket) {
     error_callback_.Run(net::ERR_FAILED);
     return;
   }
-  callback.Run(make_scoped_ptr(
+  callback.Run(base::WrapUnique(
       new StreamMessagePipeAdapter(std::move(socket), error_callback_)));
 }
 
 }  // namespace protocol
 }  // namespace remoting