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

mojo/public/cpp/bindings/tests/array_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 <utility>
+
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/lib/array_internal.h"
 #include "mojo/public/cpp/bindings/lib/array_serialization.h"
 #include "mojo/public/cpp/bindings/lib/fixed_buffer.h"
 #include "mojo/public/cpp/bindings/tests/container_test_util.h"
 #include "mojo/public/interfaces/bindings/tests/test_structs.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace test {
@@ skipping 23 matching lines @@
     bool val = i % 3 == 0;
     array[i] = val;
     EXPECT_EQ(val, array.at(i));
   }
 }
 
 // Tests that Array<ScopedMessagePipeHandle> supports transferring handles.
 TEST_F(ArrayTest, Handle) {
   MessagePipe pipe;
   Array<ScopedMessagePipeHandle> handles(2);
-  handles[0] = pipe.handle0.Pass();
+  handles[0] = std::move(pipe.handle0);
   handles[1].reset(pipe.handle1.release());
 
   EXPECT_FALSE(pipe.handle0.is_valid());
   EXPECT_FALSE(pipe.handle1.is_valid());
 
-  Array<ScopedMessagePipeHandle> handles2 = handles.Pass();
+  Array<ScopedMessagePipeHandle> handles2 = std::move(handles);
   EXPECT_TRUE(handles2[0].is_valid());
   EXPECT_TRUE(handles2[1].is_valid());
 
-  ScopedMessagePipeHandle pipe_handle = handles2[0].Pass();
+  ScopedMessagePipeHandle pipe_handle = std::move(handles2[0]);
   EXPECT_TRUE(pipe_handle.is_valid());
   EXPECT_FALSE(handles2[0].is_valid());
 }
 
 // Tests that Array<ScopedMessagePipeHandle> supports closing handles.
 TEST_F(ArrayTest, HandlesAreClosed) {
   MessagePipe pipe;
   MojoHandle pipe0_value = pipe.handle0.get().value();
   MojoHandle pipe1_value = pipe.handle0.get().value();
 
   {
     Array<ScopedMessagePipeHandle> handles(2);
-    handles[0] = pipe.handle0.Pass();
+    handles[0] = std::move(pipe.handle0);
     handles[1].reset(pipe.handle0.release());
   }
 
   // We expect the pipes to have been closed.
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, MojoClose(pipe0_value));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, MojoClose(pipe1_value));
 }
 
 TEST_F(ArrayTest, Clone) {
   {
@@ skipping 64 matching lines @@
   Array<int32_t> array(4);
   for (size_t i = 0; i < array.size(); ++i)
     array[i] = static_cast<int32_t>(i);
 
   size_t size = GetSerializedSize_(array);
   EXPECT_EQ(8U + 4 * 4U, size);
 
   FixedBufferForTesting buf(size);
   Array_Data<int32_t>* data;
   ArrayValidateParams validate_params(0, false, nullptr);
-  SerializeArray_(array.Pass(), &buf, &data, &validate_params);
+  SerializeArray_(std::move(array), &buf, &data, &validate_params);
 
   Array<int32_t> array2;
   Deserialize_(data, &array2, nullptr);
 
   EXPECT_EQ(4U, array2.size());
   for (size_t i = 0; i < array2.size(); ++i)
     EXPECT_EQ(static_cast<int32_t>(i), array2[i]);
 }
 
 TEST_F(ArrayTest, Serialization_EmptyArrayOfPOD) {
   Array<int32_t> array(0);
   size_t size = GetSerializedSize_(array);
   EXPECT_EQ(8U, size);
 
   FixedBufferForTesting buf(size);
   Array_Data<int32_t>* data;
   ArrayValidateParams validate_params(0, false, nullptr);
-  SerializeArray_(array.Pass(), &buf, &data, &validate_params);
+  SerializeArray_(std::move(array), &buf, &data, &validate_params);
 
   Array<int32_t> array2;
   Deserialize_(data, &array2, nullptr);
   EXPECT_EQ(0U, array2.size());
 }
 
 TEST_F(ArrayTest, Serialization_ArrayOfArrayOfPOD) {
   Array<Array<int32_t>> array(2);
   for (size_t j = 0; j < array.size(); ++j) {
     Array<int32_t> inner(4);
     for (size_t i = 0; i < inner.size(); ++i)
       inner[i] = static_cast<int32_t>(i + (j * 10));
-    array[j] = inner.Pass();
+    array[j] = std::move(inner);
   }
 
   size_t size = GetSerializedSize_(array);
   EXPECT_EQ(8U + 2 * 8U + 2 * (8U + 4 * 4U), size);
 
   FixedBufferForTesting buf(size);
   Array_Data<Array_Data<int32_t>*>* data;
   ArrayValidateParams validate_params(
       0, false, new ArrayValidateParams(0, false, nullptr));
-  SerializeArray_(array.Pass(), &buf, &data, &validate_params);
+  SerializeArray_(std::move(array), &buf, &data, &validate_params);
 
   Array<Array<int32_t>> array2;
   Deserialize_(data, &array2, nullptr);
 
   EXPECT_EQ(2U, array2.size());
   for (size_t j = 0; j < array2.size(); ++j) {
     const Array<int32_t>& inner = array2[j];
     EXPECT_EQ(4U, inner.size());
     for (size_t i = 0; i < inner.size(); ++i)
       EXPECT_EQ(static_cast<int32_t>(i + (j * 10)), inner[i]);
   }
 }
 
 TEST_F(ArrayTest, Serialization_ArrayOfBool) {
   Array<bool> array(10);
   for (size_t i = 0; i < array.size(); ++i)
     array[i] = i % 2 ? true : false;
 
   size_t size = GetSerializedSize_(array);
   EXPECT_EQ(8U + 8U, size);
 
   FixedBufferForTesting buf(size);
   Array_Data<bool>* data;
   ArrayValidateParams validate_params(0, false, nullptr);
-  SerializeArray_(array.Pass(), &buf, &data, &validate_params);
+  SerializeArray_(std::move(array), &buf, &data, &validate_params);
 
   Array<bool> array2;
   Deserialize_(data, &array2, nullptr);
 
   EXPECT_EQ(10U, array2.size());
   for (size_t i = 0; i < array2.size(); ++i)
     EXPECT_EQ(i % 2 ? true : false, array2[i]);
 }
 
 TEST_F(ArrayTest, Serialization_ArrayOfString) {
   Array<String> array(10);
   for (size_t i = 0; i < array.size(); ++i) {
     char c = 'A' + static_cast<char>(i);
     array[i] = String(&c, 1);
   }
 
   size_t size = GetSerializedSize_(array);
   EXPECT_EQ(8U +            // array header
                 10 * 8U +   // array payload (10 pointers)
                 10 * (8U +  // string header
                       8U),  // string length of 1 padded to 8
             size);
 
   FixedBufferForTesting buf(size);
   Array_Data<String_Data*>* data;
   ArrayValidateParams validate_params(
       0, false, new ArrayValidateParams(0, false, nullptr));
-  SerializeArray_(array.Pass(), &buf, &data, &validate_params);
+  SerializeArray_(std::move(array), &buf, &data, &validate_params);
 
   Array<String> array2;
   Deserialize_(data, &array2, nullptr);
 
   EXPECT_EQ(10U, array2.size());
   for (size_t i = 0; i < array2.size(); ++i) {
     char c = 'A' + static_cast<char>(i);
     EXPECT_EQ(String(&c, 1), array2[i]);
   }
 }
@@ skipping 139 matching lines @@
 
 TEST_F(ArrayTest, PushBack_MoveOnly) {
   ASSERT_EQ(0u, MoveOnlyType::num_instances());
   mojo::Array<MoveOnlyType> array(2);
   array.reset();
   std::vector<MoveOnlyType*> value_ptrs;
   size_t capacity = array.storage().capacity();
   for (size_t i = 0; i < capacity; i++) {
     MoveOnlyType value;
     value_ptrs.push_back(value.ptr());
-    array.push_back(value.Pass());
+    array.push_back(std::move(value));
     ASSERT_EQ(i + 1, array.size());
     ASSERT_EQ(i + 1, value_ptrs.size());
     EXPECT_EQ(array.size() + 1, MoveOnlyType::num_instances());
     EXPECT_TRUE(array[i].moved());
     EXPECT_EQ(value_ptrs[i], array[i].ptr());
     array[i].ResetMoved();
     EXPECT_TRUE(array);
   }
   {
     MoveOnlyType value;
     value_ptrs.push_back(value.ptr());
-    array.push_back(value.Pass());
+    array.push_back(std::move(value));
     EXPECT_EQ(array.size() + 1, MoveOnlyType::num_instances());
   }
   ASSERT_EQ(capacity + 1, array.size());
   EXPECT_EQ(array.size(), MoveOnlyType::num_instances());
 
   for (size_t i = 0; i < array.size(); i++) {
     EXPECT_TRUE(array[i].moved());
     EXPECT_EQ(value_ptrs[i], array[i].ptr());
   }
   array.reset();
   EXPECT_EQ(0u, MoveOnlyType::num_instances());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace mojo