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

mojo/edk/system/raw_channel_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/system/raw_channel.h"
 
 #include <stdint.h>
 #include <stdio.h>
-
+#include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 170 matching lines @@
 
   // The start of the received data should always be on a message boundary.
   std::vector<unsigned char> bytes_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(TestMessageReaderAndChecker);
 };
 
 // Tests writing (and verifies reading using our own custom reader).
 TEST_F(RawChannelTest, WriteMessage) {
   WriteOnlyRawChannelDelegate delegate;
-  RawChannel* rc = RawChannel::Create(handles[0].Pass());
+  RawChannel* rc = RawChannel::Create(std::move(handles[0]));
   TestMessageReaderAndChecker checker(handles[1].get());
   internal::g_io_thread_task_runner->PostTask(
       FROM_HERE,
       base::Bind(&InitOnIOThread, rc, base::Unretained(&delegate)));
 
   // Write and read, for a variety of sizes.
   for (uint32_t size = 1; size < 5 * 1000 * 1000; size += size / 2 + 1) {
     EXPECT_TRUE(rc->WriteMessage(MakeTestMessage(size)));
     EXPECT_TRUE(checker.ReadAndCheckNextMessage(size)) << size;
   }
@@ skipping 65 matching lines @@
   base::Lock lock_;  // Protects the following members.
   std::vector<uint32_t> expected_sizes_;
   size_t position_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ReadCheckerRawChannelDelegate);
 };
 
 // Tests reading (writing using our own custom writer).
 TEST_F(RawChannelTest, OnReadMessage) {
   ReadCheckerRawChannelDelegate delegate;
-  RawChannel* rc = RawChannel::Create(handles[0].Pass());
+  RawChannel* rc = RawChannel::Create(std::move(handles[0]));
   internal::g_io_thread_task_runner->PostTask(
       FROM_HERE,
       base::Bind(&InitOnIOThread, rc, base::Unretained(&delegate)));
 
   // Write and read, for a variety of sizes.
   for (uint32_t size = 1; size < 5 * 1000 * 1000; size += size / 2 + 1) {
     delegate.SetExpectedSizes(std::vector<uint32_t>(1, size));
 
     EXPECT_TRUE(WriteTestMessageToHandle(handles[1].get(), size));
 
@@ skipping 76 matching lines @@
   size_t count_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ReadCountdownRawChannelDelegate);
 };
 
 TEST_F(RawChannelTest, WriteMessageAndOnReadMessage) {
   static const size_t kNumWriterThreads = 10;
   static const size_t kNumWriteMessagesPerThread = 400;
 
   WriteOnlyRawChannelDelegate writer_delegate;
-  RawChannel* writer_rc = RawChannel::Create(handles[0].Pass());
+  RawChannel* writer_rc = RawChannel::Create(std::move(handles[0]));
   internal::g_io_thread_task_runner->PostTask(
     FROM_HERE,
     base::Bind(&InitOnIOThread, writer_rc,
                base::Unretained(&writer_delegate)));
 
   ReadCountdownRawChannelDelegate reader_delegate(kNumWriterThreads *
                                                   kNumWriteMessagesPerThread);
-  RawChannel* reader_rc = RawChannel::Create(handles[1].Pass());
+  RawChannel* reader_rc = RawChannel::Create(std::move(handles[1]));
   internal::g_io_thread_task_runner->PostTask(
     FROM_HERE,
     base::Bind(&InitOnIOThread, reader_rc,
                base::Unretained(&reader_delegate)));
 
   {
     ScopedVector<RawChannelWriterThread> writer_threads;
     for (size_t i = 0; i < kNumWriterThreads; i++) {
       writer_threads.push_back(new RawChannelWriterThread(
           writer_rc, kNumWriteMessagesPerThread));
@@ skipping 70 matching lines @@
 
   bool expecting_read_error_;
   bool expecting_write_error_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ErrorRecordingRawChannelDelegate);
 };
 
 // Tests (fatal) errors.
 TEST_F(RawChannelTest, OnError) {
   ErrorRecordingRawChannelDelegate delegate(0, true, true);
-  RawChannel* rc = RawChannel::Create(handles[0].Pass());
+  RawChannel* rc = RawChannel::Create(std::move(handles[0]));
   internal::g_io_thread_task_runner->PostTask(
       FROM_HERE,
       base::Bind(&InitOnIOThread, rc, base::Unretained(&delegate)));
   FlushIOThread();
 
   // Close the handle of the other end, which should make writing fail.
   handles[1].reset();
 
   EXPECT_FALSE(rc->WriteMessage(MakeTestMessage(1)));
 
@@ skipping 23 matching lines @@
   for (size_t i = 0; i < kMessageCount;
        i++, message_size += message_size / 2 + 1)
     EXPECT_TRUE(WriteTestMessageToHandle(handles[1].get(), message_size));
 
   // Close the other end, which should make writing fail.
   handles[1].reset();
 
   // Only start up reading here. The system buffer should still contain the
   // messages that were written.
   ErrorRecordingRawChannelDelegate delegate(kMessageCount, true, true);
-  RawChannel* rc = RawChannel::Create(handles[0].Pass());
+  RawChannel* rc = RawChannel::Create(std::move(handles[0]));
   internal::g_io_thread_task_runner->PostTask(
       FROM_HERE,
       base::Bind(&InitOnIOThread, rc, base::Unretained(&delegate)));
   FlushIOThread();
 
   EXPECT_FALSE(rc->WriteMessage(MakeTestMessage(1)));
 
   // We should definitely get a write error.
   delegate.WaitForWriteError();
 
@@ skipping 28 matching lines @@
     ASSERT_EQ(2u, platform_handles->size());
     ScopedPlatformHandle h1(platform_handles->at(0));
     EXPECT_TRUE(h1.is_valid());
     ScopedPlatformHandle h2(platform_handles->at(1));
     EXPECT_TRUE(h2.is_valid());
     platform_handles->clear();
 
     {
       char buffer[100] = {};
 
-      base::ScopedFILE fp(test::FILEFromPlatformHandle(h1.Pass(), "rb"));
+      base::ScopedFILE fp(test::FILEFromPlatformHandle(std::move(h1), "rb"));
       EXPECT_TRUE(fp);
       rewind(fp.get());
       EXPECT_EQ(1u, fread(buffer, 1, sizeof(buffer), fp.get()));
       EXPECT_EQ('1', buffer[0]);
     }
 
     {
       char buffer[100] = {};
-      base::ScopedFILE fp(test::FILEFromPlatformHandle(h2.Pass(), "rb"));
+      base::ScopedFILE fp(test::FILEFromPlatformHandle(std::move(h2), "rb"));
       EXPECT_TRUE(fp);
       rewind(fp.get());
       EXPECT_EQ(1u, fread(buffer, 1, sizeof(buffer), fp.get()));
       EXPECT_EQ('2', buffer[0]);
     }
 
     done_event_.Signal();
   }
   void OnError(Error error) override {
     // We'll get a read (shutdown) error when the connection is closed.
     CHECK_EQ(error, ERROR_READ_SHUTDOWN);
   }
 
   void Wait() { done_event_.Wait(); }
 
  private:
   base::WaitableEvent done_event_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ReadPlatformHandlesCheckerRawChannelDelegate);
 };
 
 TEST_F(RawChannelTest, ReadWritePlatformHandles) {
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   WriteOnlyRawChannelDelegate write_delegate;
-  RawChannel* rc_write = RawChannel::Create(handles[0].Pass());
+  RawChannel* rc_write = RawChannel::Create(std::move(handles[0]));
   internal::g_io_thread_task_runner->PostTask(
       FROM_HERE,
       base::Bind(&InitOnIOThread, rc_write, base::Unretained(&write_delegate)));
 
   ReadPlatformHandlesCheckerRawChannelDelegate read_delegate;
-  RawChannel* rc_read = RawChannel::Create(handles[1].Pass());
+  RawChannel* rc_read = RawChannel::Create(std::move(handles[1]));
   internal::g_io_thread_task_runner->PostTask(
       FROM_HERE,
       base::Bind(&InitOnIOThread, rc_read, base::Unretained(&read_delegate)));
 
   base::FilePath unused;
   base::ScopedFILE fp1(
       base::CreateAndOpenTemporaryFileInDir(temp_dir.path(), &unused));
   EXPECT_EQ(1u, fwrite("1", 1, 1, fp1.get()));
   base::ScopedFILE fp2(
       base::CreateAndOpenTemporaryFileInDir(temp_dir.path(), &unused));
   EXPECT_EQ(1u, fwrite("2", 1, 1, fp2.get()));
 
   {
     const char kHello[] = "hello";
     ScopedPlatformHandleVectorPtr platform_handles(new PlatformHandleVector());
     platform_handles->push_back(
-        test::PlatformHandleFromFILE(fp1.Pass()).release());
+        test::PlatformHandleFromFILE(std::move(fp1)).release());
     platform_handles->push_back(
-        test::PlatformHandleFromFILE(fp2.Pass()).release());
+        test::PlatformHandleFromFILE(std::move(fp2)).release());
 
     scoped_ptr<MessageInTransit> message(
         new MessageInTransit(MessageInTransit::Type::MESSAGE,
                              sizeof(kHello), kHello));
-    message->SetTransportData(make_scoped_ptr(new TransportData(
-        platform_handles.Pass(), rc_write->GetSerializedPlatformHandleSize())));
-    EXPECT_TRUE(rc_write->WriteMessage(message.Pass()));
+    message->SetTransportData(make_scoped_ptr(
+        new TransportData(std::move(platform_handles),
+                          rc_write->GetSerializedPlatformHandleSize())));
+    EXPECT_TRUE(rc_write->WriteMessage(std::move(message)));
   }
 
   read_delegate.Wait();
 
   internal::g_io_thread_task_runner->PostTask(
       FROM_HERE,
       base::Bind(&RawChannel::Shutdown, base::Unretained(rc_read)));
   internal::g_io_thread_task_runner->PostTask(
       FROM_HERE,
       base::Bind(&RawChannel::Shutdown, base::Unretained(rc_write)));
 }
 
 }  // namespace
 }  // namespace edk
 }  // namespace mojo