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

tools/android/forwarder2/daemon.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/daemon.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <string.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
-
 #include <cstdlib>
 #include <cstring>
 #include <string>
+#include <utility>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "tools/android/forwarder2/common.h"
 #include "tools/android/forwarder2/socket.h"
@@ skipping 30 matching lines @@
       PError("Accept()");
       failed = true;
       break;
     }
     if (!client_socket->Write(welcome_message.c_str(),
                               welcome_message.length() + 1)) {
       PError("Write()");
       failed = true;
       continue;
     }
-    server_delegate->OnClientConnected(client_socket.Pass());
+    server_delegate->OnClientConnected(std::move(client_socket));
   }
   return !failed;
 }
 
 void SigChildHandler(int signal_number) {
   DCHECK_EQ(signal_number, SIGCHLD);
   int status;
   pid_t child_pid = waitpid(-1 /* any child */, &status, WNOHANG);
   if (child_pid < 0) {
     PError("waitpid");
@@ skipping 32 matching lines @@
     DCHECK(expected_welcome_message.length() + 1 <= sizeof(buf));
     memset(buf, 0, sizeof(buf));
     if (socket->Read(buf, expected_welcome_message.length() + 1) < 0) {
       perror("read");
       continue;
     }
     if (expected_welcome_message != buf) {
       LOG(ERROR) << "Unexpected message read from daemon: " << buf;
       break;
     }
-    return socket.Pass();
+    return socket;
   }
   return scoped_ptr<Socket>();
 }
 
 }  // namespace
 
 Daemon::Daemon(const std::string& log_file_path,
                const std::string& identifier,
                ClientDelegate* client_delegate,
                ServerDelegate* server_delegate,
@@ skipping 121 matching lines @@
       return true;
     }
     usleep(kIdleTimeMSec * 1000);
   }
   LOG(ERROR) << "Timed out while killing daemon. "
                 "It might still be tearing down.";
   return false;
 }
 
 }  // namespace forwarder2