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

mojo/runner/host/child_process.cc

 // Copyright 2014 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/runner/host/child_process.h"
 
+#include <utility>
+
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/stack_trace.h"
 #include "base/files/file_path.h"
 #include "base/i18n/icu_util.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 132 matching lines @@
 
   base::SingleThreadTaskRunner* io_runner() const { return io_runner_.get(); }
 
   base::SingleThreadTaskRunner* controller_runner() const {
     return controller_runner_.get();
   }
 
   ChildControllerImpl* controller() const { return controller_.get(); }
 
   void set_controller(scoped_ptr<ChildControllerImpl> controller) {
-    controller_ = controller.Pass();
+    controller_ = std::move(controller);
   }
 
  private:
   void ShutdownOnControllerThread() {
     // First, destroy the controller.
     controller_.reset();
 
     // Next shutdown IPC. We'll unblock the main thread in OnShutdownComplete().
     embedder::ShutdownIPCSupport();
   }
@@ skipping 36 matching lines @@
                    ScopedMessagePipeHandle host_message_pipe,
                    const Blocker::Unblocker& unblocker) {
     DCHECK(app_context);
     DCHECK(host_message_pipe.is_valid());
 
     DCHECK(!app_context->controller());
 
     scoped_ptr<ChildControllerImpl> impl(
         new ChildControllerImpl(app_context, app_library, unblocker));
 
-    impl->Bind(host_message_pipe.Pass());
+    impl->Bind(std::move(host_message_pipe));
 
-    app_context->set_controller(impl.Pass());
+    app_context->set_controller(std::move(impl));
   }
 
   void Bind(ScopedMessagePipeHandle handle) {
-    binding_.Bind(handle.Pass());
+    binding_.Bind(std::move(handle));
     binding_.set_connection_error_handler([this]() { OnConnectionError(); });
   }
 
   void OnConnectionError() {
     // A connection error means the connection to the shell is lost. This is not
     // recoverable.
     LOG(ERROR) << "Connection error to the shell.";
     _exit(1);
   }
 
@@ skipping 19 matching lines @@
                       const Blocker::Unblocker& unblocker)
       : app_context_(app_context),
         app_library_(app_library),
         unblocker_(unblocker),
         channel_info_(nullptr),
         binding_(this) {}
 
   static void StartAppOnMainThread(
       base::NativeLibrary app_library,
       InterfaceRequest<Application> application_request) {
-    if (!RunNativeApplication(app_library, application_request.Pass())) {
+    if (!RunNativeApplication(app_library, std::move(application_request))) {
       LOG(ERROR) << "Failure to RunNativeApplication()";
     }
   }
 
   base::ThreadChecker thread_checker_;
   AppContext* const app_context_;
   base::NativeLibrary app_library_;
   Blocker::Unblocker unblocker_;
   StartAppCallback on_app_complete_;
 
@@ skipping 18 matching lines @@
   // support integrated into mojo.
   std::vector<BrokerFilePermission> permissions;
   permissions.push_back(
       BrokerFilePermission::ReadWriteCreateUnlinkRecursive("/dev/shm/"));
   scoped_ptr<mojo::runner::LinuxSandbox> sandbox(
       new mojo::runner::LinuxSandbox(permissions));
   sandbox->Warmup();
   sandbox->EngageNamespaceSandbox();
   sandbox->EngageSeccompSandbox();
   sandbox->Seal();
-  return sandbox.Pass();
+  return sandbox;
 }
 #endif
 
 ScopedMessagePipeHandle InitializeHostMessagePipe(
     embedder::ScopedPlatformHandle platform_channel,
     scoped_refptr<base::TaskRunner> io_task_runner) {
-  ScopedMessagePipeHandle host_message_pipe(embedder::CreateChannel(
-      platform_channel.Pass(), base::Bind(&DidCreateChannel), io_task_runner));
+  ScopedMessagePipeHandle host_message_pipe(
+      embedder::CreateChannel(std::move(platform_channel),
+                              base::Bind(&DidCreateChannel), io_task_runner));
 
   if (base::CommandLine::ForCurrentProcess()->HasSwitch("use-new-edk")) {
     // When using the new Mojo EDK, each message pipe is backed by a platform
     // handle. The one platform handle that comes on the command line is used
     // to bind to the ChildController interface. However we also want a
     // platform handle to setup the communication channel by which we exchange
     // handles to/from tokens, which is needed for sandboxed Windows
     // processes.
     char broker_handle[10];
     MojoHandleSignalsState state;
     MojoResult rv =
         MojoWait(host_message_pipe.get().value(), MOJO_HANDLE_SIGNAL_READABLE,
                  MOJO_DEADLINE_INDEFINITE, &state);
     CHECK_EQ(MOJO_RESULT_OK, rv);
     uint32_t num_bytes = arraysize(broker_handle);
     rv = MojoReadMessage(host_message_pipe.get().value(),
                          broker_handle, &num_bytes, nullptr, 0,
                          MOJO_READ_MESSAGE_FLAG_NONE);
     CHECK_EQ(MOJO_RESULT_OK, rv);
 
     edk::ScopedPlatformHandle broker_channel =
         edk::PlatformChannelPair::PassClientHandleFromParentProcessFromString(
             std::string(broker_handle, num_bytes));
     CHECK(broker_channel.is_valid());
     embedder::SetParentPipeHandle(
         mojo::embedder::ScopedPlatformHandle(mojo::embedder::PlatformHandle(
             broker_channel.release().handle)));
   }
 
-  return host_message_pipe.Pass();
+  return host_message_pipe;
 }
 
 }  // namespace
 
 int ChildProcessMain() {
   DVLOG(2) << "ChildProcessMain()";
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
 
 #if defined(OS_LINUX) && !defined(OS_ANDROID)
@@ skipping 19 matching lines @@
   embedder::ScopedPlatformHandle platform_channel =
       embedder::PlatformChannelPair::PassClientHandleFromParentProcess(
           command_line);
   CHECK(platform_channel.is_valid());
 
   DCHECK(!base::MessageLoop::current());
 
   AppContext app_context;
   app_context.Init();
   ScopedMessagePipeHandle host_message_pipe = InitializeHostMessagePipe(
-      platform_channel.Pass(), app_context.io_runner());
+      std::move(platform_channel), app_context.io_runner());
   app_context.StartControllerThread();
   Blocker blocker;
   app_context.controller_runner()->PostTask(
       FROM_HERE,
       base::Bind(&ChildControllerImpl::Init, base::Unretained(&app_context),
                  base::Unretained(app_library),
                  base::Passed(&host_message_pipe), blocker.GetUnblocker()));
   // This will block, then run whatever the controller wants.
   blocker.Block();
 
   app_context.Shutdown();
 
   return 0;
 }
 
 }  // namespace runner
 }  // namespace mojo