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

mojo/edk/system/core.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/core.h"
 
+#include <utility>
 #include <vector>
 
 #include "base/containers/stack_container.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "base/time/time.h"
 #include "mojo/edk/embedder/embedder_internal.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/embedder/platform_shared_buffer.h"
 #include "mojo/edk/embedder/platform_support.h"
@@ skipping 269 matching lines @@
           MOJO_CREATE_MESSAGE_PIPE_OPTIONS_FLAG_TRANSFERABLE) {
     ScopedPlatformHandle server_handle, client_handle;
 #if defined(OS_WIN)
     internal::g_broker->CreatePlatformChannelPair(&server_handle,
                                                   &client_handle);
 #else
     PlatformChannelPair channel_pair;
     server_handle = channel_pair.PassServerHandle();
     client_handle = channel_pair.PassClientHandle();
 #endif
-    dispatcher0->Init(server_handle.Pass(), nullptr, 0u, nullptr, 0u, nullptr,
-                      nullptr);
-    dispatcher1->Init(client_handle.Pass(), nullptr, 0u, nullptr, 0u, nullptr,
-                      nullptr);
+    dispatcher0->Init(std::move(server_handle), nullptr, 0u, nullptr, 0u,
+                      nullptr, nullptr);
+    dispatcher1->Init(std::move(client_handle), nullptr, 0u, nullptr, 0u,
+                      nullptr, nullptr);
   } else {
     uint64_t pipe_id = 0;
     // route_id 0 is used internally in RoutedRawChannel. See kInternalRouteId
     // in routed_raw_channel.cc.
     // route_id 1 is used by broker communication. See kBrokerRouteId in
     // broker_messages.h.
     while (pipe_id < 2)
       pipe_id = base::RandUint64();
     dispatcher0->InitNonTransferable(pipe_id);
     dispatcher1->InitNonTransferable(pipe_id);
@@ skipping 154 matching lines @@
   DCHECK_NE(handle_pair.second, MOJO_HANDLE_INVALID);
 
   ScopedPlatformHandle server_handle, client_handle;
 #if defined(OS_WIN)
   internal::g_broker->CreatePlatformChannelPair(&server_handle, &client_handle);
 #else
   PlatformChannelPair channel_pair;
   server_handle = channel_pair.PassServerHandle();
   client_handle = channel_pair.PassClientHandle();
 #endif
-  producer_dispatcher->Init(server_handle.Pass(), nullptr, 0u);
-  consumer_dispatcher->Init(client_handle.Pass(), nullptr, 0u);
+  producer_dispatcher->Init(std::move(server_handle), nullptr, 0u);
+  consumer_dispatcher->Init(std::move(client_handle), nullptr, 0u);
 
   *data_pipe_producer_handle = handle_pair.first;
   *data_pipe_consumer_handle = handle_pair.second;
   return MOJO_RESULT_OK;
 }
 
 MojoResult Core::WriteData(MojoHandle data_pipe_producer_handle,
                            const void* elements,
                            uint32_t* num_bytes,
                            MojoWriteDataFlags flags) {
@@ skipping 125 matching lines @@
 
   scoped_ptr<PlatformSharedBufferMapping> mapping;
   MojoResult result = dispatcher->MapBuffer(offset, num_bytes, flags, &mapping);
   if (result != MOJO_RESULT_OK)
     return result;
 
   DCHECK(mapping);
   void* address = mapping->GetBase();
   {
     base::AutoLock locker(mapping_table_lock_);
-    result = mapping_table_.AddMapping(mapping.Pass());
+    result = mapping_table_.AddMapping(std::move(mapping));
   }
   if (result != MOJO_RESULT_OK)
     return result;
 
   *buffer = address;
   return MOJO_RESULT_OK;
 }
 
 MojoResult Core::UnmapBuffer(void* buffer) {
   base::AutoLock locker(mapping_table_lock_);
@@ skipping 64 matching lines @@
   if (signals_states) {
     for (; i < num_handles; i++)
       signals_states[i] = dispatchers[i]->GetHandleSignalsState();
   }
 
   return rv;
 }
 
 }  // namespace edk
 }  // namespace mojo