Convert Pass()→std::move() in //android_webview

android_webview/native/aw_dev_tools_server.cc

 // Copyright 2013 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 "android_webview/native/aw_dev_tools_server.h"
 
+#include <utility>
+
 #include "android_webview/common/aw_content_client.h"
 #include "android_webview/native/aw_contents.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/json/json_writer.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "components/devtools_http_handler/devtools_http_handler.h"
 #include "components/devtools_http_handler/devtools_http_handler_delegate.h"
@@ skipping 90 matching lines @@
 
   scoped_ptr<net::ServerSocket> CreateForTethering(std::string* name) override {
     *name = base::StringPrintf(
         kTetheringSocketName, getpid(), ++last_tethering_socket_);
     scoped_ptr<net::UnixDomainServerSocket> socket(
         new net::UnixDomainServerSocket(
             base::Bind(&content::CanUserConnectToDevTools), true));
     if (socket->ListenWithAddressAndPort(*name, 0, kBackLog) != net::OK)
       return scoped_ptr<net::ServerSocket>();
 
-    return socket.Pass();
+    return std::move(socket);
   }
 
   std::string socket_name_;
   int last_tethering_socket_;
 
   DISALLOW_COPY_AND_ASSIGN(UnixDomainServerSocketFactory);
 };
 
 }  // namespace
 
 namespace android_webview {
 
 AwDevToolsServer::AwDevToolsServer() {
 }
 
 AwDevToolsServer::~AwDevToolsServer() {
   Stop();
 }
 
 void AwDevToolsServer::Start() {
   if (devtools_http_handler_)
     return;
 
   scoped_ptr<DevToolsHttpHandler::ServerSocketFactory> factory(
       new UnixDomainServerSocketFactory(
           base::StringPrintf(kSocketNameFormat, getpid())));
   devtools_http_handler_.reset(new DevToolsHttpHandler(
-      factory.Pass(),
+      std::move(factory),
       base::StringPrintf(kFrontEndURL, content::GetWebKitRevision().c_str()),
-      new AwDevToolsServerDelegate(),
-      base::FilePath(),
-      base::FilePath(),
-      GetProduct(),
-      GetUserAgent()));
+      new AwDevToolsServerDelegate(), base::FilePath(), base::FilePath(),
+      GetProduct(), GetUserAgent()));
 }
 
 void AwDevToolsServer::Stop() {
   devtools_http_handler_.reset();
 }
 
 bool AwDevToolsServer::IsStarted() const {
   return devtools_http_handler_;
 }
 
@@ skipping 20 matching lines @@
   AwDevToolsServer* devtools_server =
       reinterpret_cast<AwDevToolsServer*>(server);
   if (enabled) {
     devtools_server->Start();
   } else {
     devtools_server->Stop();
   }
 }
 
 }  // namespace android_webview