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

mojo/public/cpp/bindings/tests/map_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/public/cpp/bindings/map.h"
+
 #include <stddef.h>
 #include <stdint.h>
+#include <utility>
 
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/lib/array_serialization.h"
 #include "mojo/public/cpp/bindings/lib/bindings_internal.h"
 #include "mojo/public/cpp/bindings/lib/fixed_buffer.h"
 #include "mojo/public/cpp/bindings/lib/validate_params.h"
-#include "mojo/public/cpp/bindings/map.h"
 #include "mojo/public/cpp/bindings/string.h"
 #include "mojo/public/cpp/bindings/tests/container_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace test {
 
 namespace {
 
 using mojo::internal::Array_Data;
@@ skipping 51 matching lines @@
 
 TEST_F(MapTest, TestIndexOperatorMoveOnly) {
   ASSERT_EQ(0u, MoveOnlyType::num_instances());
   mojo::Map<mojo::String, mojo::Array<int32_t>> map;
   std::vector<MoveOnlyType*> value_ptrs;
 
   for (size_t i = 0; i < kStringIntDataSize; ++i) {
     const char* key = kStringIntData[i].string_data;
     Array<int32_t> array(1);
     array[0] = kStringIntData[i].int_data;
-    map[key] = array.Pass();
+    map[key] = std::move(array);
     EXPECT_TRUE(map);
   }
 
   // We now read back that data, to test the behavior of operator[].
   for (size_t i = 0; i < kStringIntDataSize; ++i) {
     auto it = map.find(kStringIntData[i].string_data);
     ASSERT_TRUE(it != map.end());
     ASSERT_EQ(1u, it.GetValue().size());
     EXPECT_EQ(kStringIntData[i].int_data, it.GetValue()[0]);
   }
 }
 
 TEST_F(MapTest, ConstructedFromArray) {
   Array<String> keys(kStringIntDataSize);
   Array<int> values(kStringIntDataSize);
   for (size_t i = 0; i < kStringIntDataSize; ++i) {
     keys[i] = kStringIntData[i].string_data;
     values[i] = kStringIntData[i].int_data;
   }
 
-  Map<String, int> map(keys.Pass(), values.Pass());
+  Map<String, int> map(std::move(keys), std::move(values));
 
   for (size_t i = 0; i < kStringIntDataSize; ++i) {
     EXPECT_EQ(kStringIntData[i].int_data,
               map.at(mojo::String(kStringIntData[i].string_data)));
   }
 }
 
 TEST_F(MapTest, DecomposeMapTo) {
   Array<String> keys(kStringIntDataSize);
   Array<int> values(kStringIntDataSize);
   for (size_t i = 0; i < kStringIntDataSize; ++i) {
     keys[i] = kStringIntData[i].string_data;
     values[i] = kStringIntData[i].int_data;
   }
 
-  Map<String, int> map(keys.Pass(), values.Pass());
+  Map<String, int> map(std::move(keys), std::move(values));
   EXPECT_EQ(kStringIntDataSize, map.size());
 
   Array<String> keys2;
   Array<int> values2;
   map.DecomposeMapTo(&keys2, &values2);
   EXPECT_EQ(0u, map.size());
 
   EXPECT_EQ(kStringIntDataSize, keys2.size());
   EXPECT_EQ(kStringIntDataSize, values2.size());
 
@@ skipping 44 matching lines @@
 
 TEST_F(MapTest, Insert_MoveOnly) {
   ASSERT_EQ(0u, MoveOnlyType::num_instances());
   mojo::Map<mojo::String, MoveOnlyType> map;
   std::vector<MoveOnlyType*> value_ptrs;
 
   for (size_t i = 0; i < kStringIntDataSize; ++i) {
     const char* key = kStringIntData[i].string_data;
     MoveOnlyType value;
     value_ptrs.push_back(value.ptr());
-    map.insert(key, value.Pass());
+    map.insert(key, std::move(value));
     ASSERT_EQ(i + 1, map.size());
     ASSERT_EQ(i + 1, value_ptrs.size());
     EXPECT_EQ(map.size() + 1, MoveOnlyType::num_instances());
     EXPECT_TRUE(map.at(key).moved());
     EXPECT_EQ(value_ptrs[i], map.at(key).ptr());
     map.at(key).ResetMoved();
     EXPECT_TRUE(map);
   }
 
   // std::map doesn't have a capacity() method like std::vector so this test is
   // a lot more boring.
 
   map.reset();
   EXPECT_EQ(0u, MoveOnlyType::num_instances());
 }
 
 TEST_F(MapTest, IndexOperator_MoveOnly) {
   ASSERT_EQ(0u, MoveOnlyType::num_instances());
   mojo::Map<mojo::String, MoveOnlyType> map;
   std::vector<MoveOnlyType*> value_ptrs;
 
   for (size_t i = 0; i < kStringIntDataSize; ++i) {
     const char* key = kStringIntData[i].string_data;
     MoveOnlyType value;
     value_ptrs.push_back(value.ptr());
-    map[key] = value.Pass();
+    map[key] = std::move(value);
     ASSERT_EQ(i + 1, map.size());
     ASSERT_EQ(i + 1, value_ptrs.size());
     EXPECT_EQ(map.size() + 1, MoveOnlyType::num_instances());
     EXPECT_TRUE(map.at(key).moved());
     EXPECT_EQ(value_ptrs[i], map.at(key).ptr());
     map.at(key).ResetMoved();
     EXPECT_TRUE(map);
   }
 
   // std::map doesn't have a capacity() method like std::vector so this test is
@@ skipping 27 matching lines @@
     ASSERT_TRUE(it != stl_map.end());
     EXPECT_EQ(kStringIntData[i].int_data, it->second);
   }
 }
 
 TEST_F(MapTest, MapArrayClone) {
   Map<String, Array<String>> m;
   for (size_t i = 0; i < kStringIntDataSize; ++i) {
     Array<String> s;
     s.push_back(kStringIntData[i].string_data);
-    m.insert(kStringIntData[i].string_data, s.Pass());
+    m.insert(kStringIntData[i].string_data, std::move(s));
   }
 
   Map<String, Array<String>> m2 = m.Clone();
 
   for (auto it = m2.begin(); it != m2.end(); ++it) {
     ASSERT_EQ(1u, it.GetValue().size());
     EXPECT_EQ(it.GetKey(), it.GetValue().at(0));
   }
 }
 
 TEST_F(MapTest, ArrayOfMap) {
   {
     Array<Map<int32_t, int8_t>> array(1);
     array[0].insert(1, 42);
 
     size_t size = GetSerializedSize_(array);
     FixedBufferForTesting buf(size);
     Array_Data<Map_Data<int32_t, int8_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<Map<int32_t, int8_t>> deserialized_array;
     Deserialize_(data, &deserialized_array, nullptr);
 
     ASSERT_EQ(1u, deserialized_array.size());
     ASSERT_EQ(1u, deserialized_array[0].size());
     ASSERT_EQ(42, deserialized_array[0].at(1));
   }
 
   {
     Array<Map<String, Array<bool>>> array(1);
     Array<bool> map_value(2);
     map_value[0] = false;
     map_value[1] = true;
-    array[0].insert("hello world", map_value.Pass());
+    array[0].insert("hello world", std::move(map_value));
 
     size_t size = GetSerializedSize_(array);
     FixedBufferForTesting buf(size);
     Array_Data<Map_Data<String_Data*, Array_Data<bool>*>*>* data;
     ArrayValidateParams validate_params(
         0, false, new ArrayValidateParams(
                       0, false, new ArrayValidateParams(0, false, nullptr)));
-    SerializeArray_(array.Pass(), &buf, &data, &validate_params);
+    SerializeArray_(std::move(array), &buf, &data, &validate_params);
 
     Array<Map<String, Array<bool>>> deserialized_array;
     Deserialize_(data, &deserialized_array, nullptr);
 
     ASSERT_EQ(1u, deserialized_array.size());
     ASSERT_EQ(1u, deserialized_array[0].size());
     ASSERT_FALSE(deserialized_array[0].at("hello world")[0]);
     ASSERT_TRUE(deserialized_array[0].at("hello world")[1]);
   }
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace mojo