Use std::move() instead of scoped_ptr<>::Pass().

remoting/protocol/channel_multiplexer.cc

 // Copyright (c) 2012 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/channel_multiplexer.h"
 
 #include <string.h>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 10 matching lines @@
 namespace protocol {
 
 namespace {
 const int kChannelIdUnknown = -1;
 const int kMaxPacketSize = 1024;
 
 class PendingPacket {
  public:
   PendingPacket(scoped_ptr<MultiplexPacket> packet,
                 const base::Closure& done_task)
-      : packet(packet.Pass()),
+      : packet(std::move(packet)),
         done_task(done_task),
         pos(0U) {
   }
   ~PendingPacket() {
     done_task.Run();
   }
 
   bool is_empty() { return pos >= packet->data().size(); }
 
   int Read(char* buffer, size_t size) {
@@ skipping 107 matching lines @@
 ChannelMultiplexer::MuxChannel::~MuxChannel() {
   // Socket must be destroyed before the channel.
   DCHECK(!socket_);
   STLDeleteElements(&pending_packets_);
 }
 
 scoped_ptr<P2PStreamSocket> ChannelMultiplexer::MuxChannel::CreateSocket() {
   DCHECK(!socket_);  // Can't create more than one socket per channel.
   scoped_ptr<MuxSocket> result(new MuxSocket(this));
   socket_ = result.get();
-  return result.Pass();
+  return std::move(result);
 }
 
 void ChannelMultiplexer::MuxChannel::OnIncomingPacket(
     scoped_ptr<MultiplexPacket> packet,
     const base::Closure& done_task) {
   DCHECK_EQ(packet->channel_id(), receive_id_);
   if (packet->data().size() > 0) {
-    pending_packets_.push_back(new PendingPacket(packet.Pass(), done_task));
+    pending_packets_.push_back(new PendingPacket(std::move(packet), done_task));
     if (socket_) {
       // Notify the socket that we have more data.
       socket_->OnPacketReceived();
     }
   }
 }
 
 void ChannelMultiplexer::MuxChannel::OnBaseChannelError(int error) {
   if (socket_)
     socket_->OnBaseChannelError(error);
 }
 
 void ChannelMultiplexer::MuxChannel::OnSocketDestroyed() {
   DCHECK(socket_);
   socket_ = nullptr;
 }
 
 void ChannelMultiplexer::MuxChannel::DoWrite(
     scoped_ptr<MultiplexPacket> packet,
     const base::Closure& done_task) {
   packet->set_channel_id(send_id_);
   if (!id_sent_) {
     packet->set_channel_name(name_);
     id_sent_ = true;
   }
-  multiplexer_->DoWrite(packet.Pass(), done_task);
+  multiplexer_->DoWrite(std::move(packet), done_task);
 }
 
 int ChannelMultiplexer::MuxChannel::DoRead(
     const scoped_refptr<net::IOBuffer>& buffer,
     int buffer_len) {
   int pos = 0;
   while (buffer_len > 0 && !pending_packets_.empty()) {
     DCHECK(!pending_packets_.front()->is_empty());
     int result = pending_packets_.front()->Read(
         buffer->data() + pos, buffer_len);
@@ skipping 45 matching lines @@
   DCHECK(write_callback_.is_null());
 
   if (base_channel_error_ != net::OK)
     return base_channel_error_;
 
   scoped_ptr<MultiplexPacket> packet(new MultiplexPacket());
   size_t size = std::min(kMaxPacketSize, buffer_len);
   packet->mutable_data()->assign(buffer->data(), size);
 
   write_pending_ = true;
-  channel_->DoWrite(packet.Pass(), base::Bind(
+  channel_->DoWrite(std::move(packet), base::Bind(
       &ChannelMultiplexer::MuxSocket::OnWriteComplete, AsWeakPtr()));
 
   // OnWriteComplete() might be called above synchronously.
   if (write_pending_) {
     DCHECK(write_callback_.is_null());
     write_callback_ = callback;
     write_result_ = size;
     return net::ERR_IO_PENDING;
   }
 
@@ skipping 84 matching lines @@
     if (it->name == name) {
       pending_channels_.erase(it);
       return;
     }
   }
 }
 
 void ChannelMultiplexer::OnBaseChannelReady(
     scoped_ptr<P2PStreamSocket> socket) {
   base_channel_factory_ = nullptr;
-  base_channel_ = socket.Pass();
+  base_channel_ = std::move(socket);
 
   if (base_channel_.get()) {
     // Initialize reader and writer.
     reader_.StartReading(base_channel_.get(),
                          base::Bind(&ChannelMultiplexer::OnBaseChannelError,
                                     base::Unretained(this)));
     writer_.Init(base::Bind(&P2PStreamSocket::Write,
                             base::Unretained(base_channel_.get())),
                  base::Bind(&ChannelMultiplexer::OnBaseChannelError,
                             base::Unretained(this)));
@@ skipping 12 matching lines @@
   // |pending_channels_| list (e.g. call CancelChannelCreation()).
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&ChannelMultiplexer::DoCreatePendingChannels,
                             weak_factory_.GetWeakPtr()));
 
   PendingChannel c = pending_channels_.front();
   pending_channels_.erase(pending_channels_.begin());
   scoped_ptr<P2PStreamSocket> socket;
   if (base_channel_.get())
     socket = GetOrCreateChannel(c.name)->CreateSocket();
-  c.callback.Run(socket.Pass());
+  c.callback.Run(std::move(socket));
 }
 
 ChannelMultiplexer::MuxChannel* ChannelMultiplexer::GetOrCreateChannel(
     const std::string& name) {
   // Check if we already have a channel with the requested name.
   std::map<std::string, MuxChannel*>::iterator it = channels_.find(name);
   if (it != channels_.end())
     return it->second;
 
   // Create a new channel if we haven't found existing one.
@@ skipping 42 matching lines @@
       LOG(ERROR) << "Received packet with unknown channel_id and "
           "without channel_name.";
       done_task.Run();
       return;
     }
     channel = GetOrCreateChannel(packet->channel_name());
     channel->set_receive_id(receive_id);
     channels_by_receive_id_[receive_id] = channel;
   }
 
-  channel->OnIncomingPacket(packet.Pass(), done_task);
+  channel->OnIncomingPacket(std::move(packet), done_task);
 }
 
 void ChannelMultiplexer::DoWrite(scoped_ptr<MultiplexPacket> packet,
                                  const base::Closure& done_task) {
   writer_.Write(SerializeAndFrameMessage(*packet), done_task);
 }
 
 }  // namespace protocol
 }  // namespace remoting