* Change C++ serialization/deserialization to not be move-only operations (with the except of |Ha…

mojo/public/cpp/bindings/tests/union_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 <vector>
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/binding.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/bounds_checker.h"
 #include "mojo/public/cpp/bindings/lib/fixed_buffer.h"
+#include "mojo/public/cpp/bindings/lib/map_serialization.h"
 #include "mojo/public/cpp/bindings/string.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/test_support/test_utils.h"
 #include "mojo/public/cpp/utility/run_loop.h"
 #include "mojo/public/interfaces/bindings/tests/test_structs.mojom.h"
 #include "mojo/public/interfaces/bindings/tests/test_unions.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace test {
@@ skipping 93 matching lines @@
 
 TEST(UnionTest, PodSerialization) {
   PodUnionPtr pod1(PodUnion::New());
   pod1->set_f_int8(10);
 
   size_t size = GetSerializedSize_(pod1, false);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = nullptr;
-  SerializeUnion_(pod1.Pass(), &buf, &data, false);
+  SerializeUnion_(pod1.get(), &buf, &data, false);
 
-  PodUnionPtr pod2;
-  Deserialize_(data, &pod2);
+  PodUnionPtr pod2(PodUnion::New());
+  Deserialize_(data, pod2.get());
 
   EXPECT_EQ(10, pod2->get_f_int8());
   EXPECT_TRUE(pod2->is_f_int8());
   EXPECT_EQ(pod2->which(), PodUnion::Tag::F_INT8);
 }
 
 TEST(UnionTest, EnumSerialization) {
   PodUnionPtr pod1(PodUnion::New());
   pod1->set_f_enum(AN_ENUM_SECOND);
 
   size_t size = GetSerializedSize_(pod1, false);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = nullptr;
-  SerializeUnion_(pod1.Pass(), &buf, &data, false);
+  SerializeUnion_(pod1.get(), &buf, &data, false);
 
-  PodUnionPtr pod2;
-  Deserialize_(data, &pod2);
+  PodUnionPtr pod2 = PodUnion::New();
+  Deserialize_(data, pod2.get());
 
   EXPECT_EQ(AN_ENUM_SECOND, pod2->get_f_enum());
   EXPECT_TRUE(pod2->is_f_enum());
   EXPECT_EQ(pod2->which(), PodUnion::Tag::F_ENUM);
 }
 
 TEST(UnionTest, PodValidation) {
   PodUnionPtr pod(PodUnion::New());
   pod->set_f_int8(10);
 
   size_t size = GetSerializedSize_(pod, false);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = nullptr;
-  SerializeUnion_(pod.Pass(), &buf, &data, false);
+  SerializeUnion_(pod.get(), &buf, &data, false);
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 0);
   EXPECT_TRUE(
       internal::PodUnion_Data::Validate(raw_buf, &bounds_checker, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, SerializeNotNull) {
   PodUnionPtr pod(PodUnion::New());
   pod->set_f_int8(0);
   size_t size = GetSerializedSize_(pod, false);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = nullptr;
-  SerializeUnion_(pod.Pass(), &buf, &data, false);
+  SerializeUnion_(pod.get(), &buf, &data, false);
   EXPECT_FALSE(data->is_null());
 }
 
 TEST(UnionTest, SerializeIsNullInlined) {
   PodUnionPtr pod;
   size_t size = GetSerializedSize_(pod, false);
   EXPECT_EQ(16U, size);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = internal::PodUnion_Data::New(&buf);
 
   // Check that dirty output buffers are handled correctly by serialization.
   data->size = 16U;
   data->tag = PodUnion::Tag::F_UINT16;
   data->data.f_f_int16 = 20;
 
-  SerializeUnion_(pod.Pass(), &buf, &data, true);
+  SerializeUnion_(pod.get(), &buf, &data, true);
   EXPECT_TRUE(data->is_null());
 
-  PodUnionPtr pod2;
-  Deserialize_(data, &pod2);
-  EXPECT_TRUE(pod2.is_null());
+  PodUnionPtr pod2 = PodUnion::New();
+  Deserialize_(data, pod2.get());
+  EXPECT_EQ(pod2->which(), PodUnion::Tag::__UNKNOWN__);
 }
 
 TEST(UnionTest, SerializeIsNullNotInlined) {
   PodUnionPtr pod;
   size_t size = GetSerializedSize_(pod, false);
   EXPECT_EQ(16U, size);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = nullptr;
-  SerializeUnion_(pod.Pass(), &buf, &data, false);
+  SerializeUnion_(pod.get(), &buf, &data, false);
   EXPECT_EQ(nullptr, data);
 }
 
 TEST(UnionTest, NullValidation) {
   void* buf = nullptr;
   mojo::internal::BoundsChecker bounds_checker(buf, 0, 0);
   EXPECT_TRUE(internal::PodUnion_Data::Validate(buf, &bounds_checker, false));
 }
 
 TEST(UnionTest, OutOfAlignmentValidation) {
@@ skipping 26 matching lines @@
 }
 
 TEST(UnionTest, UnknownTagDeserialization) {
   Environment environment;
   size_t size = sizeof(internal::PodUnion_Data);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = internal::PodUnion_Data::New(&buf);
   data->size = size;
   data->tag = static_cast<internal::PodUnion_Data::PodUnion_Tag>(100);
 
-  PodUnionPtr pod2;
-  Deserialize_(data, &pod2);
+  PodUnionPtr pod2 = PodUnion::New();
+  Deserialize_(data, pod2.get());
 
   EXPECT_TRUE(pod2->has_unknown_tag());
 }
 
 TEST(UnionTest, UnknownTagValidation) {
   Environment environment;
   size_t size = sizeof(internal::PodUnion_Data);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = internal::PodUnion_Data::New(&buf);
   data->size = size;
@@ skipping 41 matching lines @@
 
 TEST(UnionTest, StringSerialization) {
   ObjectUnionPtr pod1(ObjectUnion::New());
 
   String hello("hello world");
   pod1->set_f_string(hello);
 
   size_t size = GetSerializedSize_(pod1, false);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(pod1.Pass(), &buf, &data, false);
+  SerializeUnion_(pod1.get(), &buf, &data, false);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
   data->DecodePointersAndHandles(&handles);
 
-  ObjectUnionPtr pod2;
-  Deserialize_(data, &pod2);
+  ObjectUnionPtr pod2 = ObjectUnion::New();
+  Deserialize_(data, pod2.get());
   EXPECT_EQ(hello, pod2->get_f_string());
   EXPECT_TRUE(pod2->is_f_string());
   EXPECT_EQ(pod2->which(), ObjectUnion::Tag::F_STRING);
 }
 
 TEST(UnionTest, NullStringValidation) {
   Environment environment;
   size_t size = sizeof(internal::ObjectUnion_Data);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = internal::ObjectUnion_Data::New(&buf);
@@ skipping 66 matching lines @@
   array[0]->set_f_int8(10);
   array[1]->set_f_int16(12);
   EXPECT_EQ(2U, array.size());
 
   size_t size = GetSerializedSize_(array);
   EXPECT_EQ(40U, size);
 
   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_(&array, &buf, &data, &validate_params);
 
   Array<PodUnionPtr> array2;
   Deserialize_(data, &array2);
 
   EXPECT_EQ(2U, array2.size());
 
   EXPECT_EQ(10, array2[0]->get_f_int8());
   EXPECT_EQ(12, array2[1]->get_f_int16());
 }
 
 TEST(UnionTest, PodUnionInArrayValidation) {
   Environment environment;
   Array<PodUnionPtr> array(2);
   array[0] = PodUnion::New();
   array[1] = PodUnion::New();
 
   array[0]->set_f_int8(10);
   array[1]->set_f_int16(12);
 
   size_t size = GetSerializedSize_(array);
 
   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_(&array, &buf, &data, &validate_params);
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 1);
 
   EXPECT_TRUE(Array<PodUnionPtr>::Data_::Validate(raw_buf, &bounds_checker,
                                                   &validate_params));
   free(raw_buf);
 }
 TEST(UnionTest, PodUnionInArraySerializationWithNull) {
   Environment environment;
   Array<PodUnionPtr> array(2);
   array[0] = PodUnion::New();
 
   array[0]->set_f_int8(10);
   EXPECT_EQ(2U, array.size());
 
   size_t size = GetSerializedSize_(array);
   EXPECT_EQ(40U, size);
 
   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_(&array, &buf, &data, &validate_params);
 
   Array<PodUnionPtr> array2;
   Deserialize_(data, &array2);
 
   EXPECT_EQ(2U, array2.size());
 
   EXPECT_EQ(10, array2[0]->get_f_int8());
   EXPECT_TRUE(array2[1].is_null());
 }
 
 // TODO(azani): Move back in struct_unittest.cc when possible.
 // Struct tests
 TEST(UnionTest, Clone_Union) {
   Environment environment;
   SmallStructPtr small_struct(SmallStruct::New());
   small_struct->pod_union = PodUnion::New();
   small_struct->pod_union->set_f_int8(10);
 
   SmallStructPtr clone = small_struct.Clone();
   EXPECT_EQ(10, clone->pod_union->get_f_int8());
 }
 
 // Serialization test of a struct with a union of plain old data.
 TEST(UnionTest, Serialization_UnionOfPods) {
   Environment environment;
   SmallStructPtr small_struct(SmallStruct::New());
   small_struct->pod_union = PodUnion::New();
   small_struct->pod_union->set_f_int32(10);
 
-  size_t size = GetSerializedSize_(small_struct);
+  size_t size = GetSerializedSize_(*small_struct.get());
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallStruct_Data* data = nullptr;
-  Serialize_(small_struct.Pass(), &buf, &data);
+  Serialize_(small_struct.get(), &buf, &data);
 
-  SmallStructPtr deserialized;
-  Deserialize_(data, &deserialized);
+  SmallStructPtr deserialized(SmallStruct::New());
+  Deserialize_(data, deserialized.get());
 
   EXPECT_EQ(10, deserialized->pod_union->get_f_int32());
 }
 
 // Serialization test of a struct with a union of structs.
 TEST(UnionTest, Serialization_UnionOfObjects) {
   Environment environment;
   SmallObjStructPtr obj_struct(SmallObjStruct::New());
   obj_struct->obj_union = ObjectUnion::New();
   String hello("hello world");
   obj_struct->obj_union->set_f_string(hello);
 
-  size_t size = GetSerializedSize_(obj_struct);
+  size_t size = GetSerializedSize_(*obj_struct.get());
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallObjStruct_Data* data = nullptr;
-  Serialize_(obj_struct.Pass(), &buf, &data);
+  Serialize_(obj_struct.get(), &buf, &data);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
   data->DecodePointersAndHandles(&handles);
 
-  SmallObjStructPtr deserialized;
-  Deserialize_(data, &deserialized);
+  SmallObjStructPtr deserialized(SmallObjStruct::New());
+  Deserialize_(data, deserialized.get());
 
   EXPECT_EQ(hello, deserialized->obj_union->get_f_string());
 }
 
 // Validation test of a struct with a union.
 TEST(UnionTest, Validation_UnionsInStruct) {
   Environment environment;
   SmallStructPtr small_struct(SmallStruct::New());
   small_struct->pod_union = PodUnion::New();
   small_struct->pod_union->set_f_int32(10);
 
-  size_t size = GetSerializedSize_(small_struct);
+  size_t size = GetSerializedSize_(*small_struct.get());
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallStruct_Data* data = nullptr;
-  Serialize_(small_struct.Pass(), &buf, &data);
+  Serialize_(small_struct.get(), &buf, &data);
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 0);
   EXPECT_TRUE(internal::SmallStruct_Data::Validate(raw_buf, &bounds_checker));
   free(raw_buf);
 }
 
 // Validation test of a struct union fails due to unknown union tag.
 TEST(UnionTest, Validation_PodUnionInStruct_Failure) {
   Environment environment;
   SmallStructPtr small_struct(SmallStruct::New());
   small_struct->pod_union = PodUnion::New();
   small_struct->pod_union->set_f_int32(10);
 
-  size_t size = GetSerializedSize_(small_struct);
+  size_t size = GetSerializedSize_(*small_struct.get());
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallStruct_Data* data = nullptr;
-  Serialize_(small_struct.Pass(), &buf, &data);
+  Serialize_(small_struct.get(), &buf, &data);
   data->pod_union.tag = static_cast<internal::PodUnion_Data::PodUnion_Tag>(100);
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 0);
   EXPECT_TRUE(internal::SmallStruct_Data::Validate(raw_buf, &bounds_checker));
   free(raw_buf);
 }
 
 // Validation fails due to non-nullable null union in struct.
 TEST(UnionTest, Validation_NullUnion_Failure) {
   Environment environment;
   SmallStructNonNullableUnionPtr small_struct(
       SmallStructNonNullableUnion::New());
 
-  size_t size = GetSerializedSize_(small_struct);
+  size_t size = GetSerializedSize_(*small_struct.get());
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallStructNonNullableUnion_Data* data =
       internal::SmallStructNonNullableUnion_Data::New(&buf);
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 0);
   EXPECT_FALSE(internal::SmallStructNonNullableUnion_Data::Validate(
       raw_buf, &bounds_checker));
   free(raw_buf);
 }
 
 // Validation passes with nullable null union.
 TEST(UnionTest, Validation_NullableUnion) {
   Environment environment;
   SmallStructPtr small_struct(SmallStruct::New());
 
-  size_t size = GetSerializedSize_(small_struct);
+  size_t size = GetSerializedSize_(*small_struct.get());
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallStruct_Data* data = nullptr;
-  Serialize_(small_struct.Pass(), &buf, &data);
+  Serialize_(small_struct.get(), &buf, &data);
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 0);
   EXPECT_TRUE(internal::SmallStruct_Data::Validate(raw_buf, &bounds_checker));
   free(raw_buf);
 }
 
 // TODO(azani): Move back in map_unittest.cc when possible.
 // Map Tests
@@ skipping 19 matching lines @@
   map["one"]->set_f_int8(8);
   map["two"]->set_f_int16(16);
 
   size_t size = GetSerializedSize_(map);
   EXPECT_EQ(120U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   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_(&map, &buf, &data, &validate_params);
 
   Map<String, PodUnionPtr> map2;
   Deserialize_(data, &map2);
 
   EXPECT_EQ(8, map2["one"]->get_f_int8());
   EXPECT_EQ(16, map2["two"]->get_f_int16());
 }
 
 TEST(UnionTest, PodUnionInMapSerializationWithNull) {
   Environment environment;
   Map<String, PodUnionPtr> map;
   map.insert("one", PodUnion::New());
   map.insert("two", nullptr);
 
   map["one"]->set_f_int8(8);
 
   size_t size = GetSerializedSize_(map);
   EXPECT_EQ(120U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   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_(&map, &buf, &data, &validate_params);
 
   Map<String, PodUnionPtr> map2;
   Deserialize_(data, &map2);
 
   EXPECT_EQ(8, map2["one"]->get_f_int8());
   EXPECT_TRUE(map2["two"].is_null());
 }
 
 TEST(UnionTest, StructInUnionGetterSetterPasser) {
   DummyStructPtr dummy(DummyStruct::New());
@@ skipping 11 matching lines @@
   dummy->f_int8 = 8;
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_dummy(dummy.Pass());
 
   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_(obj.get(), &buf, &data, false);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
   data->DecodePointersAndHandles(&handles);
 
-  ObjectUnionPtr obj2;
-  Deserialize_(data, &obj2);
+  ObjectUnionPtr obj2 = ObjectUnion::New();
+  Deserialize_(data, obj2.get());
   EXPECT_EQ(8, obj2->get_f_dummy()->f_int8);
 }
 
 TEST(UnionTest, StructInUnionValidation) {
   Environment environment;
   DummyStructPtr dummy(DummyStruct::New());
   dummy->f_int8 = 8;
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_dummy(dummy.Pass());
 
   size_t size = GetSerializedSize_(obj, false);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(obj.Pass(), &buf, &data, false);
+  SerializeUnion_(obj.get(), &buf, &data, false);
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 0);
   EXPECT_TRUE(
       internal::ObjectUnion_Data::Validate(raw_buf, &bounds_checker, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, StructInUnionValidationNonNullable) {
   Environment environment;
   DummyStructPtr dummy(nullptr);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_dummy(dummy.Pass());
 
   size_t size = GetSerializedSize_(obj, false);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(obj.Pass(), &buf, &data, false);
+  SerializeUnion_(obj.get(), &buf, &data, false);
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 0);
   EXPECT_FALSE(
       internal::ObjectUnion_Data::Validate(raw_buf, &bounds_checker, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, StructInUnionValidationNullable) {
   Environment environment;
   DummyStructPtr dummy(nullptr);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_nullable(dummy.Pass());
 
   size_t size = GetSerializedSize_(obj, false);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(obj.Pass(), &buf, &data, false);
+  SerializeUnion_(obj.get(), &buf, &data, false);
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 0);
   EXPECT_TRUE(
       internal::ObjectUnion_Data::Validate(raw_buf, &bounds_checker, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, ArrayInUnionGetterSetter) {
@@ skipping 18 matching lines @@
   array[1] = 9;
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_array_int8(array.Pass());
 
   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_(obj.get(), &buf, &data, false);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
   data->DecodePointersAndHandles(&handles);
 
-  ObjectUnionPtr obj2;
-  Deserialize_(data, &obj2);
+  ObjectUnionPtr obj2 = ObjectUnion::New();
+  Deserialize_(data, obj2.get());
 
   EXPECT_EQ(8, obj2->get_f_array_int8()[0]);
   EXPECT_EQ(9, obj2->get_f_array_int8()[1]);
 }
 
 TEST(UnionTest, ArrayInUnionValidation) {
   Environment environment;
 
   Array<int8_t> array(2);
   array[0] = 8;
   array[1] = 9;
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_array_int8(array.Pass());
 
   size_t size = GetSerializedSize_(obj, false);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(obj.Pass(), &buf, &data, false);
+  SerializeUnion_(obj.get(), &buf, &data, false);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 0);
 
   EXPECT_TRUE(
       internal::ObjectUnion_Data::Validate(raw_buf, &bounds_checker, false));
@@ skipping 20 matching lines @@
   map.insert("two", 2);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_map_int8(map.Pass());
 
   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_(obj.get(), &buf, &data, false);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
   data->DecodePointersAndHandles(&handles);
 
-  ObjectUnionPtr obj2;
-  Deserialize_(data, &obj2);
+  ObjectUnionPtr obj2 = ObjectUnion::New();
+  Deserialize_(data, obj2.get());
 
   EXPECT_EQ(1, obj2->get_f_map_int8()["one"]);
   EXPECT_EQ(2, obj2->get_f_map_int8()["two"]);
 }
 
 TEST(UnionTest, MapInUnionValidation) {
   Environment environment;
   Map<String, int8_t> map;
   map.insert("one", 1);
   map.insert("two", 2);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_map_int8(map.Pass());
 
   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_(obj.get(), &buf, &data, false);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 0);
 
   EXPECT_TRUE(
       internal::ObjectUnion_Data::Validate(raw_buf, &bounds_checker, false));
@@ skipping 16 matching lines @@
   pod->set_f_int8(10);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_pod_union(pod.Pass());
 
   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_(obj.get(), &buf, &data, false);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
   data->DecodePointersAndHandles(&handles);
 
-  ObjectUnionPtr obj2;
-  Deserialize_(data, &obj2);
+  ObjectUnionPtr obj2 = ObjectUnion::New();
+  Deserialize_(data, obj2.get());
   EXPECT_EQ(10, obj2->get_f_pod_union()->get_f_int8());
 }
 
 TEST(UnionTest, UnionInUnionValidation) {
   Environment environment;
   PodUnionPtr pod(PodUnion::New());
   pod->set_f_int8(10);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_pod_union(pod.Pass());
 
   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_(obj.get(), &buf, &data, false);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 0);
   EXPECT_TRUE(
       internal::ObjectUnion_Data::Validate(raw_buf, &bounds_checker, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, UnionInUnionValidationNonNullable) {
   Environment environment;
   PodUnionPtr pod(nullptr);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_pod_union(pod.Pass());
 
   size_t size = GetSerializedSize_(obj, false);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(obj.Pass(), &buf, &data, false);
+  SerializeUnion_(obj.get(), &buf, &data, false);
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 0);
   EXPECT_FALSE(
       internal::ObjectUnion_Data::Validate(raw_buf, &bounds_checker, false));
   free(raw_buf);
 }
@@ skipping 23 matching lines @@
   CreateMessagePipe(nullptr, &pipe0, &pipe1);
 
   HandleUnionPtr handle(HandleUnion::New());
   handle->set_f_message_pipe(pipe1.Pass());
 
   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_(handle.get(), &buf, &data, false);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
   EXPECT_EQ(1U, handles.size());
   data->DecodePointersAndHandles(&handles);
 
   HandleUnionPtr handle2(HandleUnion::New());
-  Deserialize_(data, &handle2);
+  Deserialize_(data, handle2.get());
 
   std::string golden("hello world");
   WriteTextMessage(pipe0.get(), golden);
 
   std::string actual;
   ReadTextMessage(handle2->get_f_message_pipe().get(), &actual);
 
   EXPECT_EQ(golden, actual);
 }
 
 TEST(UnionTest, HandleInUnionValidation) {
   Environment environment;
   ScopedMessagePipeHandle pipe0;
   ScopedMessagePipeHandle pipe1;
 
   CreateMessagePipe(nullptr, &pipe0, &pipe1);
 
   HandleUnionPtr handle(HandleUnion::New());
   handle->set_f_message_pipe(pipe1.Pass());
 
   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_(handle.get(), &buf, &data, false);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 1);
   EXPECT_TRUE(
       internal::HandleUnion_Data::Validate(raw_buf, &bounds_checker, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, HandleInUnionValidationNull) {
   Environment environment;
   ScopedMessagePipeHandle pipe;
   HandleUnionPtr handle(HandleUnion::New());
   handle->set_f_message_pipe(pipe.Pass());
 
   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_(handle.get(), &buf, &data, false);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 1);
   EXPECT_FALSE(
       internal::HandleUnion_Data::Validate(raw_buf, &bounds_checker, false));
   free(raw_buf);
@@ skipping 36 matching lines @@
   SmallCachePtr ptr;
   Binding<SmallCache> bindings(&impl, GetProxy(&ptr));
 
   HandleUnionPtr handle(HandleUnion::New());
   handle->set_f_small_cache(ptr.Pass());
   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_(handle.get(), &buf, &data, false);
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
   EXPECT_EQ(1U, handles.size());
   data->DecodePointersAndHandles(&handles);
 
   HandleUnionPtr handle2(HandleUnion::New());
-  Deserialize_(data, &handle2);
+  Deserialize_(data, handle2.get());
 
   handle2->get_f_small_cache()->SetIntValue(10);
   run_loop.RunUntilIdle();
   EXPECT_EQ(10, impl.int_value());
 }
 
 class UnionInterfaceImpl : public UnionInterface {
  public:
   UnionInterfaceImpl() {}
   ~UnionInterfaceImpl() override {}
@@ skipping 14 matching lines @@
   PodUnionPtr pod(PodUnion::New());
   pod->set_f_int16(16);
 
   ptr->Echo(pod.Pass(),
             [](PodUnionPtr out) { EXPECT_EQ(16, out->get_f_int16()); });
   run_loop.RunUntilIdle();
 }
 
 }  // namespace test
 }  // namespace mojo