Convert Pass()→std::move() in //chrome (Android edition)

chrome/browser/android/dev_tools_server.cc

Index: chrome/browser/android/dev_tools_server.cc
diff --git a/chrome/browser/android/dev_tools_server.cc b/chrome/browser/android/dev_tools_server.cc
index 6bde69ede047642ce796c49a3338fa09423f7704..3cad99b6aa98b20851eb7ba0670765dbfd8bd839 100644
--- a/chrome/browser/android/dev_tools_server.cc
+++ b/chrome/browser/android/dev_tools_server.cc
@@ -6,6 +6,7 @@
 
 #include <pwd.h>
 #include <cstring>
+#include <utility>
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_string.h"
@@ -155,14 +156,14 @@ class UnixDomainServerSocketFactory
                                         true /* use_abstract_namespace */));
 
     if (socket->ListenWithAddressAndPort(socket_name_, 0, kBackLog) == net::OK)
-      return socket.Pass();
+      return socket;
 
     // Try a fallback socket name.
     const std::string fallback_address(
         base::StringPrintf("%s_%d", socket_name_.c_str(), getpid()));
     if (socket->ListenWithAddressAndPort(fallback_address, 0, kBackLog)
         == net::OK)
-      return socket.Pass();
+      return socket;
 
     return scoped_ptr<net::ServerSocket>();
   }
@@ -175,7 +176,7 @@ class UnixDomainServerSocketFactory
     if (socket->ListenWithAddressAndPort(*name, 0, kBackLog) != net::OK)
       return scoped_ptr<net::ServerSocket>();
 
-    return socket.Pass();
+    return std::move(socket);

[Lei Zhang, 2015/12/29 23:59:30]

Do you need the std::move() here?

[dcheng, 2015/12/30 00:08:53]

Yes, since this converts from scoped_ptr<net::UnixDomainServerSocket> to
scoped_ptr<net::ServerSocket>.

I've fixed this particular instance to just make the types match (but in
general, this is not something that's easy to catch automatically)

   }
 
   std::string socket_name_;
@@ -214,13 +215,10 @@ void DevToolsServer::Start(bool allow_debug_permission) {
   scoped_ptr<DevToolsHttpHandler::ServerSocketFactory> factory(
       new UnixDomainServerSocketFactory(socket_name_, auth_callback));
   devtools_http_handler_.reset(new DevToolsHttpHandler(
-      factory.Pass(),
+      std::move(factory),
       base::StringPrintf(kFrontEndURL, content::GetWebKitRevision().c_str()),
-      new DevToolsServerDelegate(),
-      base::FilePath(),
-      base::FilePath(),
-      version_info::GetProductNameAndVersionForUserAgent(),
-      ::GetUserAgent()));
+      new DevToolsServerDelegate(), base::FilePath(), base::FilePath(),
+      version_info::GetProductNameAndVersionForUserAgent(), ::GetUserAgent()));
 }
 
 void DevToolsServer::Stop() {