Convert Pass()→std::move() in mojo/services/

mojo/services/network/network_service_delegate.cc

 // Copyright 2015 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 "mojo/services/network/network_service_delegate.h"
 
+#include <utility>
+
 #include "base/at_exit.h"
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/services/network/cookie_store_impl.h"
 #include "mojo/services/network/network_service_delegate_observer.h"
 #include "mojo/services/network/network_service_impl.h"
 #include "mojo/services/network/url_loader_factory_impl.h"
 #include "mojo/services/network/web_socket_factory_impl.h"
 #include "mojo/util/capture_util.h"
 #include "sql/mojo/mojo_vfs.h"
 
 namespace {
 
 const char kSQLThreadName[] = "SQL_IO_Thread";
 const char kUserDataDir[] = "user-data-dir";
 
 // SQL blocks on the filesystem service, so perform all SQL functions on a
 // separate thread.
 class SQLThread : public base::Thread {
  public:
   SQLThread(filesystem::DirectoryPtr directory)
       : base::Thread(kSQLThreadName),
-        directory_info_(directory.PassInterface().Pass()) {
+        directory_info_(directory.PassInterface()) {
     base::Thread::Options options;
     options.message_pump_factory =
         base::Bind(&mojo::common::MessagePumpMojo::Create);
     StartWithOptions(options);
   }
   ~SQLThread() override { Stop(); }
 
   void Init() override {
     filesystem::DirectoryPtr directory;
-    directory.Bind(directory_info_.Pass());
-    vfs_.reset(new sql::ScopedMojoFilesystemVFS(directory.Pass()));
+    directory.Bind(std::move(directory_info_));
+    vfs_.reset(new sql::ScopedMojoFilesystemVFS(std::move(directory)));
   }
 
   void CleanUp() override {
     vfs_.reset();
   }
 
  private:
   // Our VFS which wraps sqlite so that we can reuse the current sqlite code.
   scoped_ptr<sql::ScopedMojoFilesystemVFS> vfs_;
 
@@ skipping 36 matching lines @@
   // to OpenFileSystem, the entire mojo system hangs to the point where writes
   // to stderr that previously would have printed to our console aren't. The
   // apptests are also fairly resistant to being run under gdb on android.
   app_->ConnectToService("mojo:filesystem", &files_);
 
   filesystem::FileSystemClientPtr client;
   binding_.Bind(GetProxy(&client));
 
   filesystem::FileError error = filesystem::FILE_ERROR_FAILED;
   filesystem::DirectoryPtr directory;
-  files_->OpenFileSystem("origin", GetProxy(&directory), client.Pass(),
+  files_->OpenFileSystem("origin", GetProxy(&directory), std::move(client),
                          Capture(&error));
   files_.WaitForIncomingResponse();
 
-  io_worker_thread_.reset(new SQLThread(directory.Pass()));
+  io_worker_thread_.reset(new SQLThread(std::move(directory)));
 #endif
 
   // TODO(erg): Find everything else that writes to the filesystem and
   // transition it to proxying mojo:filesystem. We shouldn't have any path
   // calculation code here, but sadly need it until the transition is done. In
   // the mean time, manually handle the user-data-dir switch (which gets set in
   // tests) so that tests are writing to a temp dir.
   base::FilePath base_path;
   const base::CommandLine* command_line =
       base::CommandLine::ForCurrentProcess();
@@ skipping 32 matching lines @@
 
   // Destroy the NetworkContext now as it requires MessageLoop::current() upon
   // destruction and it is the last moment we know for sure that it is
   // running.
   context_.reset();
 }
 
 void NetworkServiceDelegate::Create(ApplicationConnection* connection,
                                     InterfaceRequest<NetworkService> request) {
   new NetworkServiceImpl(app_->app_lifetime_helper()->CreateAppRefCount(),
-                         request.Pass());
+                         std::move(request));
 }
 
 void NetworkServiceDelegate::Create(ApplicationConnection* connection,
                                     InterfaceRequest<CookieStore> request) {
-  new CookieStoreImpl(context_.get(),
-                      GURL(connection->GetRemoteApplicationURL()).GetOrigin(),
-                      app_->app_lifetime_helper()->CreateAppRefCount(),
-                      request.Pass());
+  new CookieStoreImpl(
+      context_.get(), GURL(connection->GetRemoteApplicationURL()).GetOrigin(),
+      app_->app_lifetime_helper()->CreateAppRefCount(), std::move(request));
 }
 
 void NetworkServiceDelegate::Create(
     ApplicationConnection* connection,
     InterfaceRequest<WebSocketFactory> request) {
   new WebSocketFactoryImpl(context_.get(),
                            app_->app_lifetime_helper()->CreateAppRefCount(),
-                           request.Pass());
+                           std::move(request));
 }
 
 void NetworkServiceDelegate::Create(
     ApplicationConnection* connection,
     InterfaceRequest<URLLoaderFactory> request) {
   new URLLoaderFactoryImpl(context_.get(),
                            app_->app_lifetime_helper()->CreateAppRefCount(),
-                           request.Pass());
+                           std::move(request));
 }
 
 void NetworkServiceDelegate::OnFileSystemShutdown() {
   EnsureIOThreadShutdown();
 }
 
 void NetworkServiceDelegate::EnsureIOThreadShutdown() {
   if (io_worker_thread_) {
     // Broadcast to the entire system that we have to shut down anything
     // depending on the worker thread. Either we're shutting down or the
     // filesystem service is shutting down.
     FOR_EACH_OBSERVER(NetworkServiceDelegateObserver, observers_,
                       OnIOWorkerThreadShutdown());
 
     // Destroy the io worker thread here so that we can commit any pending
     // cookies here.
     io_worker_thread_.reset();
   }
 }
 
 }  // namespace mojo