Mojo C++ bindings: switch union to use the new serialization interface.

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 <stddef.h>
 #include <stdint.h>
 #include <utility>
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
@@ skipping 104 matching lines @@
   EXPECT_EQ(10, pod_clone->get_f_int8());
   EXPECT_TRUE(pod_clone->is_f_int8());
   EXPECT_EQ(pod_clone->which(), PodUnion::Tag::F_INT8);
 }
 
 TEST(UnionTest, PodSerialization) {
   PodUnionPtr pod1(PodUnion::New());
   pod1->set_f_int8(10);
 
   mojo::internal::SerializationContext context;
-  size_t size = GetSerializedSize_(pod1, false, &context);
+  size_t size =
+      mojo::internal::PrepareToSerialize<PodUnionPtr>(pod1, false, &context);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = nullptr;
-  SerializeUnion_(std::move(pod1), &buf, &data, false, &context);
+  mojo::internal::Serialize<PodUnionPtr>(pod1, &buf, &data, false, &context);
 
   PodUnionPtr pod2;
-  Deserialize_(data, &pod2, &context);
+  mojo::internal::Deserialize<PodUnionPtr>(data, &pod2, &context);
 
   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(AnEnum::SECOND);
 
-  size_t size = GetSerializedSize_(pod1, false, nullptr);
+  size_t size =
+      mojo::internal::PrepareToSerialize<PodUnionPtr>(pod1, false, nullptr);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = nullptr;
-  SerializeUnion_(std::move(pod1), &buf, &data, false, nullptr);
+  mojo::internal::Serialize<PodUnionPtr>(pod1, &buf, &data, false, nullptr);
 
   PodUnionPtr pod2;
-  Deserialize_(data, &pod2, nullptr);
+  mojo::internal::Deserialize<PodUnionPtr>(data, &pod2, nullptr);
 
   EXPECT_EQ(AnEnum::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, nullptr);
+  size_t size =
+      mojo::internal::PrepareToSerialize<PodUnionPtr>(pod, false, nullptr);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = nullptr;
-  SerializeUnion_(std::move(pod), &buf, &data, false, nullptr);
+  mojo::internal::Serialize<PodUnionPtr>(pod, &buf, &data, false, nullptr);
   data->EncodePointers();
 
   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, nullptr);
+  size_t size =
+      mojo::internal::PrepareToSerialize<PodUnionPtr>(pod, false, nullptr);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = nullptr;
-  SerializeUnion_(std::move(pod), &buf, &data, false, nullptr);
+  mojo::internal::Serialize<PodUnionPtr>(pod, &buf, &data, false, nullptr);
   EXPECT_FALSE(data->is_null());
 }
 
 TEST(UnionTest, SerializeIsNullInlined) {
   PodUnionPtr pod;
-  size_t size = GetSerializedSize_(pod, false, nullptr);
+  size_t size =
+      mojo::internal::PrepareToSerialize<PodUnionPtr>(pod, false, nullptr);
   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_(std::move(pod), &buf, &data, true, nullptr);
+  mojo::internal::Serialize<PodUnionPtr>(pod, &buf, &data, true, nullptr);
   EXPECT_TRUE(data->is_null());
 
   PodUnionPtr pod2;
-  Deserialize_(data, &pod2, nullptr);
+  mojo::internal::Deserialize<PodUnionPtr>(data, &pod2, nullptr);
   EXPECT_TRUE(pod2.is_null());
 }
 
 TEST(UnionTest, SerializeIsNullNotInlined) {
   PodUnionPtr pod;
-  size_t size = GetSerializedSize_(pod, false, nullptr);
+  size_t size =
+      mojo::internal::PrepareToSerialize<PodUnionPtr>(pod, false, nullptr);
   EXPECT_EQ(16U, size);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = nullptr;
-  SerializeUnion_(std::move(pod), &buf, &data, false, nullptr);
+  mojo::internal::Serialize<PodUnionPtr>(pod, &buf, &data, false, nullptr);
   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 33 matching lines @@
   void* raw_buf = buf.Leak();
   EXPECT_FALSE(
       internal::PodUnion_Data::Validate(raw_buf, &bounds_checker, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, UnknownEnumValueValidation) {
   PodUnionPtr pod(PodUnion::New());
   pod->set_f_enum(static_cast<AnEnum>(0xFFFF));
 
-  size_t size = GetSerializedSize_(pod, false, nullptr);
+  size_t size =
+      mojo::internal::PrepareToSerialize<PodUnionPtr>(pod, false, nullptr);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = nullptr;
-  SerializeUnion_(std::move(pod), &buf, &data, false, nullptr);
+  mojo::internal::Serialize<PodUnionPtr>(pod, &buf, &data, false, nullptr);
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 0);
   EXPECT_FALSE(
       internal::PodUnion_Data::Validate(raw_buf, &bounds_checker, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, UnknownExtensibleEnumValueValidation) {
   PodUnionPtr pod(PodUnion::New());
   pod->set_f_extensible_enum(static_cast<AnExtensibleEnum>(0xFFFF));
 
-  size_t size = GetSerializedSize_(pod, false, nullptr);
+  size_t size =
+      mojo::internal::PrepareToSerialize<PodUnionPtr>(pod, false, nullptr);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = nullptr;
-  SerializeUnion_(std::move(pod), &buf, &data, false, nullptr);
+  mojo::internal::Serialize<PodUnionPtr>(pod, &buf, &data, false, nullptr);
 
   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, StringGetterSetter) {
@@ skipping 28 matching lines @@
   EXPECT_TRUE(pod_clone->is_f_string());
   EXPECT_EQ(pod_clone->which(), ObjectUnion::Tag::F_STRING);
 }
 
 TEST(UnionTest, StringSerialization) {
   ObjectUnionPtr pod1(ObjectUnion::New());
 
   String hello("hello world");
   pod1->set_f_string(hello);
 
-  size_t size = GetSerializedSize_(pod1, false, nullptr);
+  size_t size =
+      mojo::internal::PrepareToSerialize<ObjectUnionPtr>(pod1, false, nullptr);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(std::move(pod1), &buf, &data, false, nullptr);
+  mojo::internal::Serialize<ObjectUnionPtr>(pod1, &buf, &data, false, nullptr);
 
   data->EncodePointers();
   data->DecodePointers();
 
   ObjectUnionPtr pod2;
-  Deserialize_(data, &pod2, nullptr);
+  mojo::internal::Deserialize<ObjectUnionPtr>(data, &pod2, nullptr);
   EXPECT_EQ(hello, pod2->get_f_string());
   EXPECT_TRUE(pod2->is_f_string());
   EXPECT_EQ(pod2->which(), ObjectUnion::Tag::F_STRING);
 }
 
 TEST(UnionTest, NullStringValidation) {
   size_t size = sizeof(internal::ObjectUnion_Data);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = internal::ObjectUnion_Data::New(&buf);
   data->tag = internal::ObjectUnion_Data::ObjectUnion_Tag::F_STRING;
@@ skipping 166 matching lines @@
   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) {
   SmallStructPtr small_struct(SmallStruct::New());
   small_struct->pod_union = PodUnion::New();
   small_struct->pod_union->set_f_int32(10);
 
   mojo::internal::SerializationContext context;
-  size_t size = GetSerializedSize_(small_struct, &context);
+  size_t size = mojo::internal::PrepareToSerialize<SmallStructPtr>(small_struct,
+                                                                   &context);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallStruct_Data* data = nullptr;
-  Serialize_(std::move(small_struct), &buf, &data, &context);
+  mojo::internal::Serialize<SmallStructPtr>(small_struct, &buf, &data,
+                                            &context);
 
   SmallStructPtr deserialized;
-  Deserialize_(data, &deserialized, &context);
+  mojo::internal::Deserialize<SmallStructPtr>(data, &deserialized, &context);
 
   EXPECT_EQ(10, deserialized->pod_union->get_f_int32());
 }
 
 // Serialization test of a struct with a union of structs.
 TEST(UnionTest, Serialization_UnionOfObjects) {
   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, nullptr);
+  size_t size = mojo::internal::PrepareToSerialize<SmallObjStructPtr>(
+      obj_struct, nullptr);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallObjStruct_Data* data = nullptr;
-  Serialize_(std::move(obj_struct), &buf, &data, nullptr);
+  mojo::internal::Serialize<SmallObjStructPtr>(obj_struct, &buf, &data,
+                                               nullptr);
 
   data->EncodePointers();
   data->DecodePointers();
 
   SmallObjStructPtr deserialized;
-  Deserialize_(data, &deserialized, nullptr);
+  mojo::internal::Deserialize<SmallObjStructPtr>(data, &deserialized, nullptr);
 
   EXPECT_EQ(hello, deserialized->obj_union->get_f_string());
 }
 
 // Validation test of a struct with a union.
 TEST(UnionTest, Validation_UnionsInStruct) {
   SmallStructPtr small_struct(SmallStruct::New());
   small_struct->pod_union = PodUnion::New();
   small_struct->pod_union->set_f_int32(10);
 
   mojo::internal::SerializationContext context;
-  size_t size = GetSerializedSize_(small_struct, &context);
+  size_t size = mojo::internal::PrepareToSerialize<SmallStructPtr>(small_struct,
+                                                                   &context);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallStruct_Data* data = nullptr;
-  Serialize_(std::move(small_struct), &buf, &data, &context);
+  mojo::internal::Serialize<SmallStructPtr>(small_struct, &buf, &data,
+                                            &context);
 
   data->EncodePointers();
 
   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) {
   SmallStructPtr small_struct(SmallStruct::New());
   small_struct->pod_union = PodUnion::New();
   small_struct->pod_union->set_f_int32(10);
 
   mojo::internal::SerializationContext context;
-  size_t size = GetSerializedSize_(small_struct, &context);
+  size_t size = mojo::internal::PrepareToSerialize<SmallStructPtr>(small_struct,
+                                                                   &context);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallStruct_Data* data = nullptr;
-  Serialize_(std::move(small_struct), &buf, &data, &context);
+  mojo::internal::Serialize<SmallStructPtr>(small_struct, &buf, &data,
+                                            &context);
   data->pod_union.tag = static_cast<internal::PodUnion_Data::PodUnion_Tag>(100);
 
   data->EncodePointers();
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 0);
   EXPECT_FALSE(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) {
   SmallStructNonNullableUnionPtr small_struct(
       SmallStructNonNullableUnion::New());
 
-  size_t size = GetSerializedSize_(small_struct, nullptr);
+  size_t size =
+      mojo::internal::PrepareToSerialize<SmallStructNonNullableUnionPtr>(
+          small_struct, nullptr);
 
   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) {
   SmallStructPtr small_struct(SmallStruct::New());
 
   mojo::internal::SerializationContext context;
-  size_t size = GetSerializedSize_(small_struct, &context);
+  size_t size = mojo::internal::PrepareToSerialize<SmallStructPtr>(small_struct,
+                                                                   &context);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallStruct_Data* data = nullptr;
-  Serialize_(std::move(small_struct), &buf, &data, &context);
+  mojo::internal::Serialize<SmallStructPtr>(small_struct, &buf, &data,
+                                            &context);
 
   data->EncodePointers();
 
   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);
 }
 
@@ skipping 75 matching lines @@
   EXPECT_EQ(8, obj->get_f_dummy()->f_int8);
 }
 
 TEST(UnionTest, StructInUnionSerialization) {
   DummyStructPtr dummy(DummyStruct::New());
   dummy->f_int8 = 8;
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_dummy(std::move(dummy));
 
-  size_t size = GetSerializedSize_(obj, false, nullptr);
+  size_t size =
+      mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
   EXPECT_EQ(32U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(std::move(obj), &buf, &data, false, nullptr);
+  mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
 
   data->EncodePointers();
   data->DecodePointers();
 
   ObjectUnionPtr obj2;
-  Deserialize_(data, &obj2, nullptr);
+  mojo::internal::Deserialize<ObjectUnionPtr>(data, &obj2, nullptr);
   EXPECT_EQ(8, obj2->get_f_dummy()->f_int8);
 }
 
 TEST(UnionTest, StructInUnionValidation) {
   DummyStructPtr dummy(DummyStruct::New());
   dummy->f_int8 = 8;
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_dummy(std::move(dummy));
 
-  size_t size = GetSerializedSize_(obj, false, nullptr);
+  size_t size =
+      mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(std::move(obj), &buf, &data, false, nullptr);
+  mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
 
   data->EncodePointers();
 
   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) {
   DummyStructPtr dummy(nullptr);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_dummy(std::move(dummy));
 
-  size_t size = GetSerializedSize_(obj, false, nullptr);
+  size_t size =
+      mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(std::move(obj), &buf, &data, false, nullptr);
+  mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
 
   data->EncodePointers();
 
   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) {
   DummyStructPtr dummy(nullptr);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_nullable(std::move(dummy));
 
-  size_t size = GetSerializedSize_(obj, false, nullptr);
+  size_t size =
+      mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(std::move(obj), &buf, &data, false, nullptr);
+  mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
 
   data->EncodePointers();
 
   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);
 }
@@ skipping 11 matching lines @@
 }
 
 TEST(UnionTest, ArrayInUnionSerialization) {
   Array<int8_t> array(2);
   array[0] = 8;
   array[1] = 9;
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_array_int8(std::move(array));
 
-  size_t size = GetSerializedSize_(obj, false, nullptr);
+  size_t size =
+      mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
   EXPECT_EQ(32U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(std::move(obj), &buf, &data, false, nullptr);
+  mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
 
   data->EncodePointers();
   data->DecodePointers();
 
   ObjectUnionPtr obj2;
-  Deserialize_(data, &obj2, nullptr);
+  mojo::internal::Deserialize<ObjectUnionPtr>(data, &obj2, nullptr);
 
   EXPECT_EQ(8, obj2->get_f_array_int8()[0]);
   EXPECT_EQ(9, obj2->get_f_array_int8()[1]);
 }
 
 TEST(UnionTest, ArrayInUnionValidation) {
   Array<int8_t> array(2);
   array[0] = 8;
   array[1] = 9;
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_array_int8(std::move(array));
 
-  size_t size = GetSerializedSize_(obj, false, nullptr);
+  size_t size =
+      mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(std::move(obj), &buf, &data, false, nullptr);
+  mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
 
   data->EncodePointers();
 
   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);
@@ skipping 13 matching lines @@
 
 TEST(UnionTest, MapInUnionSerialization) {
   Map<String, int8_t> map;
   map.insert("one", 1);
   map.insert("two", 2);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_map_int8(std::move(map));
 
   mojo::internal::SerializationContext context;
-  size_t size = GetSerializedSize_(obj, false, &context);
+  size_t size =
+      mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, &context);
   EXPECT_EQ(112U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(std::move(obj), &buf, &data, false, &context);
+  mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, &context);
 
   data->EncodePointers();
   data->DecodePointers();
 
   ObjectUnionPtr obj2;
-  Deserialize_(data, &obj2, &context);
+  mojo::internal::Deserialize<ObjectUnionPtr>(data, &obj2, &context);
 
   EXPECT_EQ(1, obj2->get_f_map_int8()["one"]);
   EXPECT_EQ(2, obj2->get_f_map_int8()["two"]);
 }
 
 TEST(UnionTest, MapInUnionValidation) {
   Map<String, int8_t> map;
   map.insert("one", 1);
   map.insert("two", 2);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_map_int8(std::move(map));
 
   mojo::internal::SerializationContext context;
-  size_t size = GetSerializedSize_(obj, false, &context);
+  size_t size =
+      mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, &context);
   EXPECT_EQ(112U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(std::move(obj), &buf, &data, false, &context);
+  mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, &context);
 
   data->EncodePointers();
 
   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, UnionInUnionGetterSetter) {
   PodUnionPtr pod(PodUnion::New());
   pod->set_f_int8(10);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_pod_union(std::move(pod));
 
   EXPECT_EQ(10, obj->get_f_pod_union()->get_f_int8());
 }
 
 TEST(UnionTest, UnionInUnionSerialization) {
   PodUnionPtr pod(PodUnion::New());
   pod->set_f_int8(10);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_pod_union(std::move(pod));
 
-  size_t size = GetSerializedSize_(obj, false, nullptr);
+  size_t size =
+      mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
   EXPECT_EQ(32U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(std::move(obj), &buf, &data, false, nullptr);
+  mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
 
   data->EncodePointers();
   data->DecodePointers();
 
   ObjectUnionPtr obj2;
-  Deserialize_(data, &obj2, nullptr);
+  mojo::internal::Deserialize<ObjectUnionPtr>(data, &obj2, nullptr);
   EXPECT_EQ(10, obj2->get_f_pod_union()->get_f_int8());
 }
 
 TEST(UnionTest, UnionInUnionValidation) {
   PodUnionPtr pod(PodUnion::New());
   pod->set_f_int8(10);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_pod_union(std::move(pod));
 
-  size_t size = GetSerializedSize_(obj, false, nullptr);
+  size_t size =
+      mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
   EXPECT_EQ(32U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(std::move(obj), &buf, &data, false, nullptr);
+  mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
 
   data->EncodePointers();
 
   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) {
   PodUnionPtr pod(nullptr);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_pod_union(std::move(pod));
 
-  size_t size = GetSerializedSize_(obj, false, nullptr);
+  size_t size =
+      mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  SerializeUnion_(std::move(obj), &buf, &data, false, nullptr);
+  mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
   data->EncodePointers();
 
   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 18 matching lines @@
 TEST(UnionTest, HandleInUnionSerialization) {
   ScopedMessagePipeHandle pipe0;
   ScopedMessagePipeHandle pipe1;
 
   CreateMessagePipe(nullptr, &pipe0, &pipe1);
 
   HandleUnionPtr handle(HandleUnion::New());
   handle->set_f_message_pipe(std::move(pipe1));
 
   mojo::internal::SerializationContext context;
-  size_t size = GetSerializedSize_(handle, false, &context);
+  size_t size = mojo::internal::PrepareToSerialize<HandleUnionPtr>(
+      handle, false, &context);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::HandleUnion_Data* data = nullptr;
-  SerializeUnion_(std::move(handle), &buf, &data, false, &context);
+  mojo::internal::Serialize<HandleUnionPtr>(handle, &buf, &data, false,
+                                            &context);
   EXPECT_EQ(1U, context.handles.size());
 
   HandleUnionPtr handle2(HandleUnion::New());
-  Deserialize_(data, &handle2, &context);
+  mojo::internal::Deserialize<HandleUnionPtr>(data, &handle2, &context);
 
   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) {
   ScopedMessagePipeHandle pipe0;
   ScopedMessagePipeHandle pipe1;
 
   CreateMessagePipe(nullptr, &pipe0, &pipe1);
 
   HandleUnionPtr handle(HandleUnion::New());
   handle->set_f_message_pipe(std::move(pipe1));
 
   mojo::internal::SerializationContext context;
-  size_t size = GetSerializedSize_(handle, false, &context);
+  size_t size = mojo::internal::PrepareToSerialize<HandleUnionPtr>(
+      handle, false, &context);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::HandleUnion_Data* data = nullptr;
-  SerializeUnion_(std::move(handle), &buf, &data, false, &context);
+  mojo::internal::Serialize<HandleUnionPtr>(handle, &buf, &data, false,
+                                            &context);
 
   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) {
   ScopedMessagePipeHandle pipe;
   HandleUnionPtr handle(HandleUnion::New());
   handle->set_f_message_pipe(std::move(pipe));
 
   mojo::internal::SerializationContext context;
-  size_t size = GetSerializedSize_(handle, false, &context);
+  size_t size = mojo::internal::PrepareToSerialize<HandleUnionPtr>(
+      handle, false, &context);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::HandleUnion_Data* data = nullptr;
-  SerializeUnion_(std::move(handle), &buf, &data, false, &context);
+  mojo::internal::Serialize<HandleUnionPtr>(handle, &buf, &data, false,
+                                            &context);
 
   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);
 }
 
 class SmallCacheImpl : public SmallCache {
@@ skipping 34 matching lines @@
 TEST(UnionTest, InterfaceInUnionSerialization) {
   base::MessageLoop message_loop;
   base::RunLoop run_loop;
   SmallCacheImpl impl(run_loop.QuitClosure());
   SmallCachePtr ptr;
   Binding<SmallCache> bindings(&impl, GetProxy(&ptr));
 
   mojo::internal::SerializationContext context;
   HandleUnionPtr handle(HandleUnion::New());
   handle->set_f_small_cache(std::move(ptr));
-  size_t size = GetSerializedSize_(handle, false, &context);
+  size_t size = mojo::internal::PrepareToSerialize<HandleUnionPtr>(
+      handle, false, &context);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::HandleUnion_Data* data = nullptr;
-  SerializeUnion_(std::move(handle), &buf, &data, false, &context);
+  mojo::internal::Serialize<HandleUnionPtr>(handle, &buf, &data, false,
+                                            &context);
   EXPECT_EQ(1U, context.handles.size());
 
   HandleUnionPtr handle2(HandleUnion::New());
-  Deserialize_(data, &handle2, &context);
+  mojo::internal::Deserialize<HandleUnionPtr>(data, &handle2, &context);
 
   handle2->get_f_small_cache()->SetIntValue(10);
   run_loop.Run();
   EXPECT_EQ(10, impl.int_value());
 }
 
 class UnionInterfaceImpl : public UnionInterface {
  public:
   UnionInterfaceImpl() {}
   ~UnionInterfaceImpl() override {}
@@ skipping 13 matching lines @@
   PodUnionPtr pod(PodUnion::New());
   pod->set_f_int16(16);
 
   ptr->Echo(std::move(pod),
             [](PodUnionPtr out) { EXPECT_EQ(16, out->get_f_int16()); });
   run_loop.RunUntilIdle();
 }
 
 }  // namespace test
 }  // namespace mojo