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

mojo/edk/embedder/embedder_unittest.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/edk/embedder/embedder.h"
 
+#include <utility>
+
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/embedder/simple_platform_support.h"
 #include "mojo/edk/embedder/test_embedder.h"
@@ skipping 333 matching lines @@
 // Android multi-process tests are not executing the new process. This is flaky.
 #define MAYBE_MultiprocessChannels DISABLED_MultiprocessChannels
 #else
 #define MAYBE_MultiprocessChannels MultiprocessChannels
 #endif  // defined(OS_ANDROID)
 TEST_F(EmbedderTest, MAYBE_MultiprocessChannels) {
   test::MultiprocessTestHelper multiprocess_test_helper;
   multiprocess_test_helper.StartChild("MultiprocessChannelsClient");
 
   {
-    MojoHandle server_mp = CreateMessagePipe(
-        multiprocess_test_helper.server_platform_handle.Pass()).release().
-            value();
+    MojoHandle server_mp =
+        CreateMessagePipe(
+            std::move(multiprocess_test_helper.server_platform_handle))
+            .release()
+            .value();
 
     // 1. Write a message to |server_mp| (attaching nothing).
     const char kHello[] = "hello";
     ASSERT_EQ(MOJO_RESULT_OK,
               MojoWriteMessage(server_mp, kHello,
                                static_cast<uint32_t>(sizeof(kHello)), nullptr,
                                0, MOJO_WRITE_MESSAGE_FLAG_NONE));
 
     // TODO(vtl): If the scope were ended immediately here (maybe after closing
     // |server_mp|), we die with a fatal error in |Channel::HandleLocalError()|.
@@ skipping 85 matching lines @@
     ASSERT_EQ(MOJO_HANDLE_SIGNAL_NONE, state.satisfiable_signals);
 #endif
     ASSERT_EQ(MOJO_RESULT_OK, MojoClose(mp2));
   }
 
   EXPECT_TRUE(multiprocess_test_helper.WaitForChildTestShutdown());
 }
 
 MOJO_MULTIPROCESS_TEST_CHILD_TEST(MultiprocessChannelsClient) {
   ScopedPlatformHandle client_platform_handle =
-      test::MultiprocessTestHelper::client_platform_handle.Pass();
+      std::move(test::MultiprocessTestHelper::client_platform_handle);
   EXPECT_TRUE(client_platform_handle.is_valid());
 
-  MojoHandle client_mp = CreateMessagePipe(
-      client_platform_handle.Pass()).release().value();
+  MojoHandle client_mp =
+      CreateMessagePipe(std::move(client_platform_handle)).release().value();
 
   // 1. Read the first message from |client_mp|.
   MojoHandleSignalsState state;
   ASSERT_EQ(MOJO_RESULT_OK, MojoWait(client_mp, MOJO_HANDLE_SIGNAL_READABLE,
                                       MOJO_DEADLINE_INDEFINITE, &state));
   ASSERT_EQ(kSignalReadadableWritable, state.satisfied_signals);
   ASSERT_EQ(kSignalAll, state.satisfiable_signals);
 
   char buffer[1000] = {};
   uint32_t num_bytes = static_cast<uint32_t>(sizeof(buffer));
@@ skipping 84 matching lines @@
   ASSERT_EQ(MOJO_HANDLE_SIGNAL_PEER_CLOSED, state.satisfiable_signals);
   ASSERT_EQ(MOJO_RESULT_OK, MojoClose(mp1));
 }
 
 // TODO(vtl): Test immediate write & close.
 // TODO(vtl): Test broken-connection cases.
 
 }  // namespace
 }  // namespace edk
 }  // namespace mojo