mojo/public/cpp/bindings/tests/union_unittest.cc - Issue 1535943002: Convert Pass()→std::move() in //mojo/public/

Unified Diff: mojo/public/cpp/bindings/tests/union_unittest.cc

Issue 1535943002: Convert Pass()→std::move() in //mojo/public/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove self-move checks to avoid triggering clang warning. Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« mojo/public/cpp/bindings/array.h ('K') | « mojo/public/cpp/bindings/tests/type_conversion_unittest.cc ('k') | mojo/public/cpp/bindings/tests/validation_unittest.cc » ('j') | mojo/public/cpp/system/tests/core_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/public/cpp/bindings/tests/union_unittest.cc

diff --git a/mojo/public/cpp/bindings/tests/union_unittest.cc b/mojo/public/cpp/bindings/tests/union_unittest.cc

index 8f35bd001b2e9a0974e580ced616d1749dda114c..fdb21c64c3dc52e7ee190f93758cbdab9a04a7b2 100644

--- a/mojo/public/cpp/bindings/tests/union_unittest.cc

+++ b/mojo/public/cpp/bindings/tests/union_unittest.cc

@@ -2,6 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

+#include <utility>

#include <vector>

#include "base/message_loop/message_loop.h"

@@ -123,7 +124,7 @@ TEST(UnionTest, PodSerialization) {

mojo::internal::FixedBufferForTesting buf(size);

internal::PodUnion_Data* data = nullptr;

- SerializeUnion_(pod1.Pass(), &buf, &data, false);

+ SerializeUnion_(std::move(pod1), &buf, &data, false);

PodUnionPtr pod2;

Deserialize_(data, &pod2, nullptr);

@@ -142,7 +143,7 @@ TEST(UnionTest, EnumSerialization) {

mojo::internal::FixedBufferForTesting buf(size);

internal::PodUnion_Data* data = nullptr;

- SerializeUnion_(pod1.Pass(), &buf, &data, false);

+ SerializeUnion_(std::move(pod1), &buf, &data, false);

PodUnionPtr pod2;

Deserialize_(data, &pod2, nullptr);

@@ -161,7 +162,7 @@ TEST(UnionTest, PodValidation) {

mojo::internal::FixedBufferForTesting buf(size);

internal::PodUnion_Data* data = nullptr;

- SerializeUnion_(pod.Pass(), &buf, &data, false);

+ SerializeUnion_(std::move(pod), &buf, &data, false);

std::vector<Handle> handles;

data->EncodePointersAndHandles(&handles);

EXPECT_TRUE(handles.empty());

@@ -180,7 +181,7 @@ TEST(UnionTest, SerializeNotNull) {

size_t size = GetSerializedSize_(pod, false);

mojo::internal::FixedBufferForTesting buf(size);

internal::PodUnion_Data* data = nullptr;

- SerializeUnion_(pod.Pass(), &buf, &data, false);

+ SerializeUnion_(std::move(pod), &buf, &data, false);

EXPECT_FALSE(data->is_null());

}

@@ -196,7 +197,7 @@ TEST(UnionTest, SerializeIsNullInlined) {

data->tag = PodUnion::Tag::F_UINT16;

data->data.f_f_int16 = 20;

- SerializeUnion_(pod.Pass(), &buf, &data, true);

+ SerializeUnion_(std::move(pod), &buf, &data, true);

EXPECT_TRUE(data->is_null());

PodUnionPtr pod2;

@@ -210,7 +211,7 @@ TEST(UnionTest, SerializeIsNullNotInlined) {

EXPECT_EQ(16U, size);

mojo::internal::FixedBufferForTesting buf(size);

internal::PodUnion_Data* data = nullptr;

- SerializeUnion_(pod.Pass(), &buf, &data, false);

+ SerializeUnion_(std::move(pod), &buf, &data, false);

EXPECT_EQ(nullptr, data);

}

@@ -302,7 +303,7 @@ TEST(UnionTest, StringSerialization) {

size_t size = GetSerializedSize_(pod1, false);

mojo::internal::FixedBufferForTesting buf(size);

internal::ObjectUnion_Data* data = nullptr;

- SerializeUnion_(pod1.Pass(), &buf, &data, false);

+ SerializeUnion_(std::move(pod1), &buf, &data, false);

std::vector<Handle> handles;

data->EncodePointersAndHandles(&handles);

@@ -392,7 +393,7 @@ TEST(UnionTest, PodUnionInArraySerialization) {

mojo::internal::FixedBufferForTesting buf(size);

mojo::internal::Array_Data<internal::PodUnion_Data>* data;

mojo::internal::ArrayValidateParams validate_params(0, false, nullptr);

- SerializeArray_(array.Pass(), &buf, &data, &validate_params);

+ SerializeArray_(std::move(array), &buf, &data, &validate_params);

Array<PodUnionPtr> array2;

Deserialize_(data, &array2, nullptr);

@@ -416,7 +417,7 @@ TEST(UnionTest, PodUnionInArraySerializationWithNull) {

mojo::internal::FixedBufferForTesting buf(size);

mojo::internal::Array_Data<internal::PodUnion_Data>* data;

mojo::internal::ArrayValidateParams validate_params(0, true, nullptr);

- SerializeArray_(array.Pass(), &buf, &data, &validate_params);

+ SerializeArray_(std::move(array), &buf, &data, &validate_params);

Array<PodUnionPtr> array2;

Deserialize_(data, &array2, nullptr);

@@ -448,7 +449,7 @@ TEST(UnionTest, Serialization_UnionOfPods) {

mojo::internal::FixedBufferForTesting buf(size);

internal::SmallStruct_Data* data = nullptr;

- Serialize_(small_struct.Pass(), &buf, &data);

+ Serialize_(std::move(small_struct), &buf, &data);

SmallStructPtr deserialized;

Deserialize_(data, &deserialized, nullptr);

@@ -467,7 +468,7 @@ TEST(UnionTest, Serialization_UnionOfObjects) {

mojo::internal::FixedBufferForTesting buf(size);

internal::SmallObjStruct_Data* data = nullptr;

- Serialize_(obj_struct.Pass(), &buf, &data);

+ Serialize_(std::move(obj_struct), &buf, &data);

std::vector<Handle> handles;

data->EncodePointersAndHandles(&handles);

@@ -489,7 +490,7 @@ TEST(UnionTest, Validation_UnionsInStruct) {

mojo::internal::FixedBufferForTesting buf(size);

internal::SmallStruct_Data* data = nullptr;

- Serialize_(small_struct.Pass(), &buf, &data);

+ Serialize_(std::move(small_struct), &buf, &data);

std::vector<Handle> handles;

data->EncodePointersAndHandles(&handles);

@@ -512,7 +513,7 @@ TEST(UnionTest, Validation_PodUnionInStruct_Failure) {

mojo::internal::FixedBufferForTesting buf(size);

internal::SmallStruct_Data* data = nullptr;

- Serialize_(small_struct.Pass(), &buf, &data);

+ Serialize_(std::move(small_struct), &buf, &data);

data->pod_union.tag = static_cast<internal::PodUnion_Data::PodUnion_Tag>(100);

std::vector<Handle> handles;

@@ -553,7 +554,7 @@ TEST(UnionTest, Validation_NullableUnion) {

mojo::internal::FixedBufferForTesting buf(size);

internal::SmallStruct_Data* data = nullptr;

- Serialize_(small_struct.Pass(), &buf, &data);

+ Serialize_(std::move(small_struct), &buf, &data);

std::vector<Handle> handles;

data->EncodePointersAndHandles(&handles);

@@ -596,7 +597,7 @@ TEST(UnionTest, PodUnionInMapSerialization) {

mojo::internal::Map_Data<mojo::internal::String_Data*,

internal::PodUnion_Data>* data;

mojo::internal::ArrayValidateParams validate_params(0, false, nullptr);

- SerializeMap_(map.Pass(), &buf, &data, &validate_params);

+ SerializeMap_(std::move(map), &buf, &data, &validate_params);

Map<String, PodUnionPtr> map2;

Deserialize_(data, &map2, nullptr);

@@ -619,7 +620,7 @@ TEST(UnionTest, PodUnionInMapSerializationWithNull) {

mojo::internal::Map_Data<mojo::internal::String_Data*,

internal::PodUnion_Data>* data;

mojo::internal::ArrayValidateParams validate_params(0, true, nullptr);

- SerializeMap_(map.Pass(), &buf, &data, &validate_params);

+ SerializeMap_(std::move(map), &buf, &data, &validate_params);

Map<String, PodUnionPtr> map2;

Deserialize_(data, &map2, nullptr);

@@ -633,7 +634,7 @@ TEST(UnionTest, StructInUnionGetterSetterPasser) {

dummy->f_int8 = 8;

ObjectUnionPtr obj(ObjectUnion::New());

- obj->set_f_dummy(dummy.Pass());

+ obj->set_f_dummy(std::move(dummy));

EXPECT_EQ(8, obj->get_f_dummy()->f_int8);

}

@@ -643,14 +644,14 @@ TEST(UnionTest, StructInUnionSerialization) {

dummy->f_int8 = 8;

ObjectUnionPtr obj(ObjectUnion::New());

- obj->set_f_dummy(dummy.Pass());

+ obj->set_f_dummy(std::move(dummy));

size_t size = GetSerializedSize_(obj, false);

EXPECT_EQ(32U, size);

mojo::internal::FixedBufferForTesting buf(size);

internal::ObjectUnion_Data* data = nullptr;

- SerializeUnion_(obj.Pass(), &buf, &data, false);

+ SerializeUnion_(std::move(obj), &buf, &data, false);

std::vector<Handle> handles;

data->EncodePointersAndHandles(&handles);

@@ -666,13 +667,13 @@ TEST(UnionTest, StructInUnionValidation) {

dummy->f_int8 = 8;

ObjectUnionPtr obj(ObjectUnion::New());

- obj->set_f_dummy(dummy.Pass());

+ obj->set_f_dummy(std::move(dummy));

size_t size = GetSerializedSize_(obj, false);

mojo::internal::FixedBufferForTesting buf(size);

internal::ObjectUnion_Data* data = nullptr;

- SerializeUnion_(obj.Pass(), &buf, &data, false);

+ SerializeUnion_(std::move(obj), &buf, &data, false);

std::vector<Handle> handles;

data->EncodePointersAndHandles(&handles);

@@ -690,13 +691,13 @@ TEST(UnionTest, StructInUnionValidationNonNullable) {

DummyStructPtr dummy(nullptr);

ObjectUnionPtr obj(ObjectUnion::New());

- obj->set_f_dummy(dummy.Pass());

+ obj->set_f_dummy(std::move(dummy));

size_t size = GetSerializedSize_(obj, false);

mojo::internal::FixedBufferForTesting buf(size);

internal::ObjectUnion_Data* data = nullptr;

- SerializeUnion_(obj.Pass(), &buf, &data, false);

+ SerializeUnion_(std::move(obj), &buf, &data, false);

std::vector<Handle> handles;

data->EncodePointersAndHandles(&handles);

@@ -714,13 +715,13 @@ TEST(UnionTest, StructInUnionValidationNullable) {

DummyStructPtr dummy(nullptr);

ObjectUnionPtr obj(ObjectUnion::New());

- obj->set_f_nullable(dummy.Pass());

+ obj->set_f_nullable(std::move(dummy));

size_t size = GetSerializedSize_(obj, false);

mojo::internal::FixedBufferForTesting buf(size);

internal::ObjectUnion_Data* data = nullptr;

- SerializeUnion_(obj.Pass(), &buf, &data, false);

+ SerializeUnion_(std::move(obj), &buf, &data, false);

std::vector<Handle> handles;

data->EncodePointersAndHandles(&handles);

@@ -740,7 +741,7 @@ TEST(UnionTest, ArrayInUnionGetterSetter) {

array[1] = 9;

ObjectUnionPtr obj(ObjectUnion::New());

- obj->set_f_array_int8(array.Pass());

+ obj->set_f_array_int8(std::move(array));

EXPECT_EQ(8, obj->get_f_array_int8()[0]);

EXPECT_EQ(9, obj->get_f_array_int8()[1]);

@@ -752,14 +753,14 @@ TEST(UnionTest, ArrayInUnionSerialization) {

array[1] = 9;

ObjectUnionPtr obj(ObjectUnion::New());

- obj->set_f_array_int8(array.Pass());

+ obj->set_f_array_int8(std::move(array));

size_t size = GetSerializedSize_(obj, false);

EXPECT_EQ(32U, size);

mojo::internal::FixedBufferForTesting buf(size);

internal::ObjectUnion_Data* data = nullptr;

- SerializeUnion_(obj.Pass(), &buf, &data, false);

+ SerializeUnion_(std::move(obj), &buf, &data, false);

std::vector<Handle> handles;

data->EncodePointersAndHandles(&handles);

@@ -778,12 +779,12 @@ TEST(UnionTest, ArrayInUnionValidation) {

array[1] = 9;

ObjectUnionPtr obj(ObjectUnion::New());

- obj->set_f_array_int8(array.Pass());

+ obj->set_f_array_int8(std::move(array));

size_t size = GetSerializedSize_(obj, false);

mojo::internal::FixedBufferForTesting buf(size);

internal::ObjectUnion_Data* data = nullptr;

- SerializeUnion_(obj.Pass(), &buf, &data, false);

+ SerializeUnion_(std::move(obj), &buf, &data, false);

std::vector<Handle> handles;

data->EncodePointersAndHandles(&handles);

@@ -803,7 +804,7 @@ TEST(UnionTest, MapInUnionGetterSetter) {

map.insert("two", 2);

ObjectUnionPtr obj(ObjectUnion::New());

- obj->set_f_map_int8(map.Pass());

+ obj->set_f_map_int8(std::move(map));

EXPECT_EQ(1, obj->get_f_map_int8()["one"]);

EXPECT_EQ(2, obj->get_f_map_int8()["two"]);

@@ -815,14 +816,14 @@ TEST(UnionTest, MapInUnionSerialization) {

map.insert("two", 2);

ObjectUnionPtr obj(ObjectUnion::New());

- obj->set_f_map_int8(map.Pass());

+ obj->set_f_map_int8(std::move(map));

size_t size = GetSerializedSize_(obj, false);

EXPECT_EQ(112U, size);

mojo::internal::FixedBufferForTesting buf(size);

internal::ObjectUnion_Data* data = nullptr;

- SerializeUnion_(obj.Pass(), &buf, &data, false);

+ SerializeUnion_(std::move(obj), &buf, &data, false);

std::vector<Handle> handles;

data->EncodePointersAndHandles(&handles);

@@ -841,14 +842,14 @@ TEST(UnionTest, MapInUnionValidation) {

map.insert("two", 2);

ObjectUnionPtr obj(ObjectUnion::New());

- obj->set_f_map_int8(map.Pass());

+ obj->set_f_map_int8(std::move(map));

size_t size = GetSerializedSize_(obj, false);

EXPECT_EQ(112U, size);

mojo::internal::FixedBufferForTesting buf(size);

internal::ObjectUnion_Data* data = nullptr;

- SerializeUnion_(obj.Pass(), &buf, &data, false);

+ SerializeUnion_(std::move(obj), &buf, &data, false);

std::vector<Handle> handles;

data->EncodePointersAndHandles(&handles);

@@ -868,7 +869,7 @@ TEST(UnionTest, UnionInUnionGetterSetter) {

pod->set_f_int8(10);

ObjectUnionPtr obj(ObjectUnion::New());

- obj->set_f_pod_union(pod.Pass());

+ obj->set_f_pod_union(std::move(pod));

EXPECT_EQ(10, obj->get_f_pod_union()->get_f_int8());

}

@@ -878,14 +879,14 @@ TEST(UnionTest, UnionInUnionSerialization) {

pod->set_f_int8(10);

ObjectUnionPtr obj(ObjectUnion::New());

- obj->set_f_pod_union(pod.Pass());

+ obj->set_f_pod_union(std::move(pod));

size_t size = GetSerializedSize_(obj, false);

EXPECT_EQ(32U, size);

mojo::internal::FixedBufferForTesting buf(size);

internal::ObjectUnion_Data* data = nullptr;

- SerializeUnion_(obj.Pass(), &buf, &data, false);

+ SerializeUnion_(std::move(obj), &buf, &data, false);

std::vector<Handle> handles;

data->EncodePointersAndHandles(&handles);

@@ -901,14 +902,14 @@ TEST(UnionTest, UnionInUnionValidation) {

pod->set_f_int8(10);

ObjectUnionPtr obj(ObjectUnion::New());

- obj->set_f_pod_union(pod.Pass());

+ obj->set_f_pod_union(std::move(pod));

size_t size = GetSerializedSize_(obj, false);

EXPECT_EQ(32U, size);

mojo::internal::FixedBufferForTesting buf(size);

internal::ObjectUnion_Data* data = nullptr;

- SerializeUnion_(obj.Pass(), &buf, &data, false);

+ SerializeUnion_(std::move(obj), &buf, &data, false);

std::vector<Handle> handles;

data->EncodePointersAndHandles(&handles);

@@ -926,13 +927,13 @@ TEST(UnionTest, UnionInUnionValidationNonNullable) {

PodUnionPtr pod(nullptr);

ObjectUnionPtr obj(ObjectUnion::New());

- obj->set_f_pod_union(pod.Pass());

+ obj->set_f_pod_union(std::move(pod));

size_t size = GetSerializedSize_(obj, false);

mojo::internal::FixedBufferForTesting buf(size);

internal::ObjectUnion_Data* data = nullptr;

- SerializeUnion_(obj.Pass(), &buf, &data, false);

+ SerializeUnion_(std::move(obj), &buf, &data, false);

std::vector<Handle> handles;

data->EncodePointersAndHandles(&handles);

@@ -951,7 +952,7 @@ TEST(UnionTest, HandleInUnionGetterSetter) {

CreateMessagePipe(nullptr, &pipe0, &pipe1);

HandleUnionPtr handle(HandleUnion::New());

- handle->set_f_message_pipe(pipe1.Pass());

+ handle->set_f_message_pipe(std::move(pipe1));

std::string golden("hello world");

WriteTextMessage(pipe0.get(), golden);

@@ -969,14 +970,14 @@ TEST(UnionTest, HandleInUnionSerialization) {

CreateMessagePipe(nullptr, &pipe0, &pipe1);

HandleUnionPtr handle(HandleUnion::New());

- handle->set_f_message_pipe(pipe1.Pass());

+ handle->set_f_message_pipe(std::move(pipe1));

size_t size = GetSerializedSize_(handle, false);

EXPECT_EQ(16U, size);

mojo::internal::FixedBufferForTesting buf(size);

internal::HandleUnion_Data* data = nullptr;

- SerializeUnion_(handle.Pass(), &buf, &data, false);

+ SerializeUnion_(std::move(handle), &buf, &data, false);

std::vector<Handle> handles;

data->EncodePointersAndHandles(&handles);

@@ -1002,14 +1003,14 @@ TEST(UnionTest, HandleInUnionValidation) {

CreateMessagePipe(nullptr, &pipe0, &pipe1);

HandleUnionPtr handle(HandleUnion::New());

- handle->set_f_message_pipe(pipe1.Pass());

+ handle->set_f_message_pipe(std::move(pipe1));

size_t size = GetSerializedSize_(handle, false);

EXPECT_EQ(16U, size);

mojo::internal::FixedBufferForTesting buf(size);

internal::HandleUnion_Data* data = nullptr;

- SerializeUnion_(handle.Pass(), &buf, &data, false);

+ SerializeUnion_(std::move(handle), &buf, &data, false);

std::vector<Handle> handles;

data->EncodePointersAndHandles(&handles);

@@ -1025,14 +1026,14 @@ TEST(UnionTest, HandleInUnionValidation) {

TEST(UnionTest, HandleInUnionValidationNull) {

ScopedMessagePipeHandle pipe;

HandleUnionPtr handle(HandleUnion::New());

- handle->set_f_message_pipe(pipe.Pass());

+ handle->set_f_message_pipe(std::move(pipe));

size_t size = GetSerializedSize_(handle, false);

EXPECT_EQ(16U, size);

mojo::internal::FixedBufferForTesting buf(size);

internal::HandleUnion_Data* data = nullptr;

- SerializeUnion_(handle.Pass(), &buf, &data, false);

+ SerializeUnion_(std::move(handle), &buf, &data, false);

std::vector<Handle> handles;

data->EncodePointersAndHandles(&handles);

@@ -1067,7 +1068,7 @@ TEST(UnionTest, InterfaceInUnion) {

Binding<SmallCache> bindings(&impl, GetProxy(&ptr));

HandleUnionPtr handle(HandleUnion::New());

- handle->set_f_small_cache(ptr.Pass());

+ handle->set_f_small_cache(std::move(ptr));

handle->get_f_small_cache()->SetIntValue(10);

run_loop.RunUntilIdle();

@@ -1081,13 +1082,13 @@ TEST(UnionTest, InterfaceInUnionSerialization) {

Binding<SmallCache> bindings(&impl, GetProxy(&ptr));

HandleUnionPtr handle(HandleUnion::New());

- handle->set_f_small_cache(ptr.Pass());

+ handle->set_f_small_cache(std::move(ptr));

size_t size = GetSerializedSize_(handle, false);

EXPECT_EQ(16U, size);

mojo::internal::FixedBufferForTesting buf(size);

internal::HandleUnion_Data* data = nullptr;

- SerializeUnion_(handle.Pass(), &buf, &data, false);

+ SerializeUnion_(std::move(handle), &buf, &data, false);

std::vector<Handle> handles;

data->EncodePointersAndHandles(&handles);

@@ -1109,7 +1110,7 @@ class UnionInterfaceImpl : public UnionInterface {

private:

void Echo(PodUnionPtr in, const EchoCallback& callback) override {

- callback.Run(in.Pass());

+ callback.Run(std::move(in));

}

};

@@ -1122,7 +1123,7 @@ TEST(UnionTest, UnionInInterface) {

PodUnionPtr pod(PodUnion::New());

pod->set_f_int16(16);

- ptr->Echo(pod.Pass(),

+ ptr->Echo(std::move(pod),

[](PodUnionPtr out) { EXPECT_EQ(16, out->get_f_int16()); });

run_loop.RunUntilIdle();

}