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

tools/android/forwarder2/device_listener.cc

Index: tools/android/forwarder2/device_listener.cc
diff --git a/tools/android/forwarder2/device_listener.cc b/tools/android/forwarder2/device_listener.cc
index d6f1d8d3f3a81516fdea44b0d65959a91cf3dbb7..9825c3c54fe31d8fd794df63c23fb6d61040bd7e 100644
--- a/tools/android/forwarder2/device_listener.cc
+++ b/tools/android/forwarder2/device_listener.cc
@@ -4,6 +4,8 @@
 
 #include "tools/android/forwarder2/device_listener.h"
 
+#include <utility>
+
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
@@ -28,16 +30,16 @@ scoped_ptr<DeviceListener> DeviceListener::Create(
     LOG(ERROR) << "Device could not bind and listen to local port "
                << listener_port;
     SendCommand(command::BIND_ERROR, listener_port, host_socket.get());
-    return device_listener.Pass();
+    return device_listener;
   }
   // In case the |listener_port_| was zero, GetPort() will return the
   // currently (non-zero) allocated port for this socket.
   listener_port = listener_socket->GetPort();
   SendCommand(command::BIND_SUCCESS, listener_port, host_socket.get());
-  device_listener.reset(
-      new DeviceListener(listener_socket.Pass(), host_socket.Pass(),
-                         listener_port, error_callback));
-  return device_listener.Pass();
+  device_listener.reset(new DeviceListener(std::move(listener_socket),
+                                           std::move(host_socket),
+                                           listener_port, error_callback));
+  return device_listener;
 }
 
 DeviceListener::~DeviceListener() {
@@ -62,8 +64,8 @@ DeviceListener::DeviceListener(scoped_ptr<Socket> listener_socket,
                                int port,
                                const ErrorCallback& error_callback)
     : self_deleter_helper_(this, error_callback),
-      listener_socket_(listener_socket.Pass()),
-      host_socket_(host_socket.Pass()),
+      listener_socket_(std::move(listener_socket)),
+      host_socket_(std::move(host_socket)),
       listener_port_(port),
       deletion_task_runner_(base::ThreadTaskRunnerHandle::Get()),
       thread_("DeviceListener") {
@@ -118,8 +120,8 @@ void DeviceListener::OnAdbDataSocketReceivedOnInternalThread(
   DCHECK(adb_data_socket);
   SendCommand(command::ADB_DATA_SOCKET_SUCCESS, listener_port_,
               host_socket_.get());
-  forwarders_manager_.CreateAndStartNewForwarder(
-      device_data_socket_.Pass(), adb_data_socket.Pass());
+  forwarders_manager_.CreateAndStartNewForwarder(std::move(device_data_socket_),
+                                                 std::move(adb_data_socket));
   AcceptNextClientSoon();
 }