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

mojo/public/cpp/bindings/tests/struct_unittest.cc

Index: mojo/public/cpp/bindings/tests/struct_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/struct_unittest.cc b/mojo/public/cpp/bindings/tests/struct_unittest.cc
index 4df2b17bb1c54272cc5989be64488e8cff3ca9ae..2085548466c3f10fab1fa97929ba781a2443689e 100644
--- a/mojo/public/cpp/bindings/tests/struct_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/struct_unittest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include <string.h>
+#include <utility>
 
 #include "mojo/public/cpp/bindings/lib/fixed_buffer.h"
 #include "mojo/public/cpp/system/message_pipe.h"
@@ -19,7 +20,7 @@ RectPtr MakeRect(int32_t factor = 1) {
   rect->y = 2 * factor;
   rect->width = 10 * factor;
   rect->height = 20 * factor;
-  return rect.Pass();
+  return rect;
 }
 
 void CheckRect(const Rect& rect, int32_t factor = 1) {
@@ -39,10 +40,10 @@ MultiVersionStructPtr MakeMultiVersionStruct() {
   output->f_array[1] = 9;
   output->f_array[2] = 8;
   MessagePipe pipe;
-  output->f_message_pipe = pipe.handle0.Pass();
+  output->f_message_pipe = std::move(pipe.handle0);
   output->f_int16 = 42;
 
-  return output.Pass();
+  return output;
 }
 
 template <typename U, typename T>
@@ -53,7 +54,7 @@ U SerializeAndDeserialize(T input) {
   size_t size = GetSerializedSize_(input);
   mojo::internal::FixedBufferForTesting buf(size + 32);
   InputDataType data;
-  Serialize_(input.Pass(), &buf, &data);
+  Serialize_(std::move(input), &buf, &data);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
@@ -68,7 +69,7 @@ U SerializeAndDeserialize(T input) {
 
   U output;
   Deserialize_(output_data, &output, nullptr);
-  return output.Pass();
+  return std::move(output);
 }
 
 using StructTest = testing::Test;
@@ -136,7 +137,7 @@ TEST_F(StructTest, Serialization_Basic) {
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::Rect_Data* data;
-  Serialize_(rect.Pass(), &buf, &data);
+  Serialize_(std::move(rect), &buf, &data);
 
   RectPtr rect2;
   Deserialize_(data, &rect2, nullptr);
@@ -169,7 +170,7 @@ TEST_F(StructTest, Serialization_StructPointers) {
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::RectPair_Data* data;
-  Serialize_(pair.Pass(), &buf, &data);
+  Serialize_(std::move(pair), &buf, &data);
 
   RectPairPtr pair2;
   Deserialize_(data, &pair2, nullptr);
@@ -200,7 +201,7 @@ TEST_F(StructTest, Serialization_ArrayPointers) {
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::NamedRegion_Data* data;
-  Serialize_(region.Pass(), &buf, &data);
+  Serialize_(std::move(region), &buf, &data);
 
   NamedRegionPtr region2;
   Deserialize_(data, &region2, nullptr);
@@ -226,7 +227,7 @@ TEST_F(StructTest, Serialization_NullArrayPointers) {
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::NamedRegion_Data* data;
-  Serialize_(region.Pass(), &buf, &data);
+  Serialize_(std::move(region), &buf, &data);
 
   NamedRegionPtr region2;
   Deserialize_(data, &region2, nullptr);
@@ -244,7 +245,7 @@ TEST_F(StructTest, Versioning_OldToNew) {
     expected_output->f_int32 = 123;
 
     MultiVersionStructPtr output =
-        SerializeAndDeserialize<MultiVersionStructPtr>(input.Pass());
+        SerializeAndDeserialize<MultiVersionStructPtr>(std::move(input));
     EXPECT_TRUE(output);
     EXPECT_TRUE(output->Equals(*expected_output));
   }
@@ -258,7 +259,7 @@ TEST_F(StructTest, Versioning_OldToNew) {
     expected_output->f_rect = MakeRect(5);
 
     MultiVersionStructPtr output =
-        SerializeAndDeserialize<MultiVersionStructPtr>(input.Pass());
+        SerializeAndDeserialize<MultiVersionStructPtr>(std::move(input));
     EXPECT_TRUE(output);
     EXPECT_TRUE(output->Equals(*expected_output));
   }
@@ -274,7 +275,7 @@ TEST_F(StructTest, Versioning_OldToNew) {
     expected_output->f_string = "hello";
 
     MultiVersionStructPtr output =
-        SerializeAndDeserialize<MultiVersionStructPtr>(input.Pass());
+        SerializeAndDeserialize<MultiVersionStructPtr>(std::move(input));
     EXPECT_TRUE(output);
     EXPECT_TRUE(output->Equals(*expected_output));
   }
@@ -298,7 +299,7 @@ TEST_F(StructTest, Versioning_OldToNew) {
     expected_output->f_array[2] = 8;
 
     MultiVersionStructPtr output =
-        SerializeAndDeserialize<MultiVersionStructPtr>(input.Pass());
+        SerializeAndDeserialize<MultiVersionStructPtr>(std::move(input));
     EXPECT_TRUE(output);
     EXPECT_TRUE(output->Equals(*expected_output));
   }
@@ -313,7 +314,7 @@ TEST_F(StructTest, Versioning_OldToNew) {
     input->f_array[1] = 9;
     input->f_array[2] = 8;
     MessagePipe pipe;
-    input->f_message_pipe = pipe.handle0.Pass();
+    input->f_message_pipe = std::move(pipe.handle0);
 
     MultiVersionStructPtr expected_output(MultiVersionStruct::New());
     expected_output->f_int32 = 123;
@@ -327,7 +328,7 @@ TEST_F(StructTest, Versioning_OldToNew) {
     MojoHandle expected_handle = input->f_message_pipe.get().value();
 
     MultiVersionStructPtr output =
-        SerializeAndDeserialize<MultiVersionStructPtr>(input.Pass());
+        SerializeAndDeserialize<MultiVersionStructPtr>(std::move(input));
     EXPECT_TRUE(output);
     EXPECT_EQ(expected_handle, output->f_message_pipe.get().value());
     output->f_message_pipe.reset();
@@ -351,7 +352,7 @@ TEST_F(StructTest, Versioning_NewToOld) {
     MojoHandle expected_handle = input->f_message_pipe.get().value();
 
     MultiVersionStructV7Ptr output =
-        SerializeAndDeserialize<MultiVersionStructV7Ptr>(input.Pass());
+        SerializeAndDeserialize<MultiVersionStructV7Ptr>(std::move(input));
     EXPECT_TRUE(output);
     EXPECT_EQ(expected_handle, output->f_message_pipe.get().value());
     output->f_message_pipe.reset();
@@ -370,7 +371,7 @@ TEST_F(StructTest, Versioning_NewToOld) {
     expected_output->f_array[2] = 8;
 
     MultiVersionStructV5Ptr output =
-        SerializeAndDeserialize<MultiVersionStructV5Ptr>(input.Pass());
+        SerializeAndDeserialize<MultiVersionStructV5Ptr>(std::move(input));
     EXPECT_TRUE(output);
     EXPECT_TRUE(output->Equals(*expected_output));
   }
@@ -383,7 +384,7 @@ TEST_F(StructTest, Versioning_NewToOld) {
     expected_output->f_string = "hello";
 
     MultiVersionStructV3Ptr output =
-        SerializeAndDeserialize<MultiVersionStructV3Ptr>(input.Pass());
+        SerializeAndDeserialize<MultiVersionStructV3Ptr>(std::move(input));
     EXPECT_TRUE(output);
     EXPECT_TRUE(output->Equals(*expected_output));
   }
@@ -395,7 +396,7 @@ TEST_F(StructTest, Versioning_NewToOld) {
     expected_output->f_rect = MakeRect(5);
 
     MultiVersionStructV1Ptr output =
-        SerializeAndDeserialize<MultiVersionStructV1Ptr>(input.Pass());
+        SerializeAndDeserialize<MultiVersionStructV1Ptr>(std::move(input));
     EXPECT_TRUE(output);
     EXPECT_TRUE(output->Equals(*expected_output));
   }
@@ -406,7 +407,7 @@ TEST_F(StructTest, Versioning_NewToOld) {
     expected_output->f_int32 = 123;
 
     MultiVersionStructV0Ptr output =
-        SerializeAndDeserialize<MultiVersionStructV0Ptr>(input.Pass());
+        SerializeAndDeserialize<MultiVersionStructV0Ptr>(std::move(input));
     EXPECT_TRUE(output);
     EXPECT_TRUE(output->Equals(*expected_output));
   }