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

mojo/edk/system/data_pipe_producer_dispatcher.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 "mojo/edk/system/data_pipe_producer_dispatcher.h"
 
+#include <utility>
+
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/edk/embedder/embedder_internal.h"
 #include "mojo/edk/embedder/platform_shared_buffer.h"
 #include "mojo/edk/embedder/platform_support.h"
 #include "mojo/edk/system/configuration.h"
 #include "mojo/edk/system/data_pipe.h"
 
 namespace mojo {
 namespace edk {
 
 void DataPipeProducerDispatcher::Init(
     ScopedPlatformHandle message_pipe,
     char* serialized_write_buffer, size_t serialized_write_buffer_size) {
   if (message_pipe.is_valid()) {
-    channel_ = RawChannel::Create(message_pipe.Pass());
+    channel_ = RawChannel::Create(std::move(message_pipe));
     channel_->SetSerializedData(
         nullptr, 0u, serialized_write_buffer, serialized_write_buffer_size,
         nullptr, nullptr);
     internal::g_io_thread_task_runner->PostTask(
         FROM_HERE, base::Bind(&DataPipeProducerDispatcher::InitOnIO, this));
   } else {
     error_ = true;
   }
 }
 
@@ skipping 28 matching lines @@
                             &shared_memory_handle, &shared_memory_size);
 
   scoped_refptr<DataPipeProducerDispatcher> rv(Create(options));
 
   char* serialized_write_buffer = nullptr;
   size_t serialized_write_buffer_size = 0;
   scoped_refptr<PlatformSharedBuffer> shared_buffer;
   scoped_ptr<PlatformSharedBufferMapping> mapping;
   if (shared_memory_size) {
     shared_buffer = internal::g_platform_support->CreateSharedBufferFromHandle(
-        shared_memory_size, shared_memory_handle.Pass());
+        shared_memory_size, std::move(shared_memory_handle));
     mapping = shared_buffer->Map(0, shared_memory_size);
     serialized_write_buffer = static_cast<char*>(mapping->GetBase());
     serialized_write_buffer_size = shared_memory_size;
   }
 
-  rv->Init(platform_handle.Pass(), serialized_write_buffer,
+  rv->Init(std::move(platform_handle), serialized_write_buffer,
            serialized_write_buffer_size);
   return rv;
 }
 
 DataPipeProducerDispatcher::DataPipeProducerDispatcher(
     const MojoCreateDataPipeOptions& options)
     : options_(options), channel_(nullptr), error_(false), serialized_(false) {
 }
 
 DataPipeProducerDispatcher::~DataPipeProducerDispatcher() {
@@ skipping 16 matching lines @@
 }
 
 scoped_refptr<Dispatcher>
 DataPipeProducerDispatcher::CreateEquivalentDispatcherAndCloseImplNoLock() {
   lock().AssertAcquired();
 
   SerializeInternal();
 
   scoped_refptr<DataPipeProducerDispatcher> rv = Create(options_);
   serialized_write_buffer_.swap(rv->serialized_write_buffer_);
-  rv->serialized_platform_handle_ = serialized_platform_handle_.Pass();
+  rv->serialized_platform_handle_ = std::move(serialized_platform_handle_);
   rv->serialized_ = true;
   return scoped_refptr<Dispatcher>(rv.get());
 }
 
 MojoResult DataPipeProducerDispatcher::WriteDataImplNoLock(
     const void* elements,
     uint32_t* num_bytes,
     MojoWriteDataFlags flags) {
   lock().AssertAcquired();
   if (InTwoPhaseWrite())
@@ skipping 155 matching lines @@
     scoped_refptr<PlatformSharedBuffer> shared_buffer(
         internal::g_platform_support->CreateSharedBuffer(
             shared_memory_size));
     scoped_ptr<PlatformSharedBufferMapping> mapping(
         shared_buffer->Map(0, shared_memory_size));
     memcpy(mapping->GetBase(), &serialized_write_buffer_[0],
            shared_memory_size);
     shared_memory_handle.reset(shared_buffer->PassPlatformHandle().release());
   }
 
-  DataPipe::EndSerialize(
-      options_,
-      serialized_platform_handle_.Pass(),
-      shared_memory_handle.Pass(), shared_memory_size,
-      destination, actual_size, platform_handles);
+  DataPipe::EndSerialize(options_, std::move(serialized_platform_handle_),
+                         std::move(shared_memory_handle), shared_memory_size,
+                         destination, actual_size, platform_handles);
   CloseImplNoLock();
   return true;
 }
 
 void DataPipeProducerDispatcher::TransportStarted() {
   started_transport_.Acquire();
 }
 
 void DataPipeProducerDispatcher::TransportEnded() {
   started_transport_.Release();
@@ skipping 60 matching lines @@
   DCHECK_GT(max_message_num_bytes, 0u);
 
   uint32_t offset = 0;
   while (offset < num_bytes) {
     uint32_t message_num_bytes =
         std::min(static_cast<uint32_t>(max_message_num_bytes),
                  num_bytes - offset);
     scoped_ptr<MessageInTransit> message(new MessageInTransit(
         MessageInTransit::Type::MESSAGE, message_num_bytes,
         static_cast<const char*>(elements) + offset));
-    if (!channel_->WriteMessage(message.Pass())) {
+    if (!channel_->WriteMessage(std::move(message))) {
       error_ = true;
       return false;
     }
 
     offset += message_num_bytes;
   }
 
   return true;
 }
 
@@ skipping 11 matching lines @@
     CHECK(fds.empty());
     if (write_error)
       serialized_platform_handle_.reset();
     channel_ = nullptr;
   }
   serialized_ = true;
 }
 
 }  // namespace edk
 }  // namespace mojo