Convert Pass()→std::move() in //tools/android

tools/android/forwarder2/forwarder.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 "tools/android/forwarder2/forwarder.h"
 
+#include <utility>
+
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/posix/eintr_wrapper.h"
 #include "tools/android/forwarder2/socket.h"
 
 namespace forwarder2 {
 namespace {
 
 const int kBufferSize = 32 * 1024;
 
@@ skipping 197 matching lines @@
 
   int bytes_read_;
   int write_offset_;
   BufferedCopier* peer_;
   State state_;
   char buffer_[kBufferSize];
 
   DISALLOW_COPY_AND_ASSIGN(BufferedCopier);
 };
 
-Forwarder::Forwarder(scoped_ptr<Socket> socket1,
-                     scoped_ptr<Socket> socket2)
-    : socket1_(socket1.Pass()),
-      socket2_(socket2.Pass()),
+Forwarder::Forwarder(scoped_ptr<Socket> socket1, scoped_ptr<Socket> socket2)
+    : socket1_(std::move(socket1)),
+      socket2_(std::move(socket2)),
       buffer1_(new BufferedCopier(socket1_.get(), socket2_.get())),
       buffer2_(new BufferedCopier(socket2_.get(), socket1_.get())) {
   buffer1_->SetPeer(buffer2_.get());
   buffer2_->SetPeer(buffer1_.get());
 }
 
 Forwarder::~Forwarder() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
@@ skipping 14 matching lines @@
   return buffer1_->is_closed() && buffer2_->is_closed();
 }
 
 void Forwarder::Shutdown() {
   DCHECK(thread_checker_.CalledOnValidThread());
   buffer1_->Close();
   buffer2_->Close();
 }
 
 }  // namespace forwarder2