Mojo C++ bindings: share DataView class between chromium and blink variants.

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

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 d65a348f87f6206abf390c2527ff73d598c769d8..b461380d72973390a49bc7ff69f79fc9a575c5bd 100644
--- a/mojo/public/cpp/bindings/tests/union_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/union_unittest.cc
@@ -123,16 +123,17 @@ TEST(UnionTest, PodSerialization) {
   pod1->set_f_int8(10);
 
   mojo::internal::SerializationContext context;
-  size_t size =
-      mojo::internal::PrepareToSerialize<PodUnionPtr>(pod1, false, &context);
+  size_t size = mojo::internal::PrepareToSerialize<PodUnionDataView>(
+      pod1, false, &context);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = nullptr;
-  mojo::internal::Serialize<PodUnionPtr>(pod1, &buf, &data, false, &context);
+  mojo::internal::Serialize<PodUnionDataView>(pod1, &buf, &data, false,
+                                              &context);
 
   PodUnionPtr pod2;
-  mojo::internal::Deserialize<PodUnionPtr>(data, &pod2, &context);
+  mojo::internal::Deserialize<PodUnionDataView>(data, &pod2, &context);
 
   EXPECT_EQ(10, pod2->get_f_int8());
   EXPECT_TRUE(pod2->is_f_int8());
@@ -143,16 +144,17 @@ TEST(UnionTest, EnumSerialization) {
   PodUnionPtr pod1(PodUnion::New());
   pod1->set_f_enum(AnEnum::SECOND);
 
-  size_t size =
-      mojo::internal::PrepareToSerialize<PodUnionPtr>(pod1, false, nullptr);
+  size_t size = mojo::internal::PrepareToSerialize<PodUnionDataView>(
+      pod1, false, nullptr);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = nullptr;
-  mojo::internal::Serialize<PodUnionPtr>(pod1, &buf, &data, false, nullptr);
+  mojo::internal::Serialize<PodUnionDataView>(pod1, &buf, &data, false,
+                                              nullptr);
 
   PodUnionPtr pod2;
-  mojo::internal::Deserialize<PodUnionPtr>(data, &pod2, nullptr);
+  mojo::internal::Deserialize<PodUnionDataView>(data, &pod2, nullptr);
 
   EXPECT_EQ(AnEnum::SECOND, pod2->get_f_enum());
   EXPECT_TRUE(pod2->is_f_enum());
@@ -164,12 +166,12 @@ TEST(UnionTest, PodValidation) {
   pod->set_f_int8(10);
 
   size_t size =
-      mojo::internal::PrepareToSerialize<PodUnionPtr>(pod, false, nullptr);
+      mojo::internal::PrepareToSerialize<PodUnionDataView>(pod, false, nullptr);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = nullptr;
-  mojo::internal::Serialize<PodUnionPtr>(pod, &buf, &data, false, nullptr);
+  mojo::internal::Serialize<PodUnionDataView>(pod, &buf, &data, false, nullptr);
 
   void* raw_buf = buf.Leak();
   mojo::internal::ValidationContext validation_context(
@@ -183,17 +185,17 @@ TEST(UnionTest, SerializeNotNull) {
   PodUnionPtr pod(PodUnion::New());
   pod->set_f_int8(0);
   size_t size =
-      mojo::internal::PrepareToSerialize<PodUnionPtr>(pod, false, nullptr);
+      mojo::internal::PrepareToSerialize<PodUnionDataView>(pod, false, nullptr);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = nullptr;
-  mojo::internal::Serialize<PodUnionPtr>(pod, &buf, &data, false, nullptr);
+  mojo::internal::Serialize<PodUnionDataView>(pod, &buf, &data, false, nullptr);
   EXPECT_FALSE(data->is_null());
 }
 
 TEST(UnionTest, SerializeIsNullInlined) {
   PodUnionPtr pod;
   size_t size =
-      mojo::internal::PrepareToSerialize<PodUnionPtr>(pod, false, nullptr);
+      mojo::internal::PrepareToSerialize<PodUnionDataView>(pod, false, nullptr);
   EXPECT_EQ(16U, size);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = internal::PodUnion_Data::New(&buf);
@@ -203,22 +205,22 @@ TEST(UnionTest, SerializeIsNullInlined) {
   data->tag = PodUnion::Tag::F_UINT16;
   data->data.f_f_int16 = 20;
 
-  mojo::internal::Serialize<PodUnionPtr>(pod, &buf, &data, true, nullptr);
+  mojo::internal::Serialize<PodUnionDataView>(pod, &buf, &data, true, nullptr);
   EXPECT_TRUE(data->is_null());
 
   PodUnionPtr pod2;
-  mojo::internal::Deserialize<PodUnionPtr>(data, &pod2, nullptr);
+  mojo::internal::Deserialize<PodUnionDataView>(data, &pod2, nullptr);
   EXPECT_TRUE(pod2.is_null());
 }
 
 TEST(UnionTest, SerializeIsNullNotInlined) {
   PodUnionPtr pod;
   size_t size =
-      mojo::internal::PrepareToSerialize<PodUnionPtr>(pod, false, nullptr);
+      mojo::internal::PrepareToSerialize<PodUnionDataView>(pod, false, nullptr);
   EXPECT_EQ(16U, size);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = nullptr;
-  mojo::internal::Serialize<PodUnionPtr>(pod, &buf, &data, false, nullptr);
+  mojo::internal::Serialize<PodUnionDataView>(pod, &buf, &data, false, nullptr);
   EXPECT_EQ(nullptr, data);
 }
 
@@ -275,12 +277,12 @@ TEST(UnionTest, UnknownEnumValueValidation) {
   pod->set_f_enum(static_cast<AnEnum>(0xFFFF));
 
   size_t size =
-      mojo::internal::PrepareToSerialize<PodUnionPtr>(pod, false, nullptr);
+      mojo::internal::PrepareToSerialize<PodUnionDataView>(pod, false, nullptr);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = nullptr;
-  mojo::internal::Serialize<PodUnionPtr>(pod, &buf, &data, false, nullptr);
+  mojo::internal::Serialize<PodUnionDataView>(pod, &buf, &data, false, nullptr);
 
   void* raw_buf = buf.Leak();
   mojo::internal::ValidationContext validation_context(
@@ -295,12 +297,12 @@ TEST(UnionTest, UnknownExtensibleEnumValueValidation) {
   pod->set_f_extensible_enum(static_cast<AnExtensibleEnum>(0xFFFF));
 
   size_t size =
-      mojo::internal::PrepareToSerialize<PodUnionPtr>(pod, false, nullptr);
+      mojo::internal::PrepareToSerialize<PodUnionDataView>(pod, false, nullptr);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::PodUnion_Data* data = nullptr;
-  mojo::internal::Serialize<PodUnionPtr>(pod, &buf, &data, false, nullptr);
+  mojo::internal::Serialize<PodUnionDataView>(pod, &buf, &data, false, nullptr);
 
   void* raw_buf = buf.Leak();
   mojo::internal::ValidationContext validation_context(
@@ -349,14 +351,15 @@ TEST(UnionTest, StringSerialization) {
   String hello("hello world");
   pod1->set_f_string(hello);
 
-  size_t size =
-      mojo::internal::PrepareToSerialize<ObjectUnionPtr>(pod1, false, nullptr);
+  size_t size = mojo::internal::PrepareToSerialize<ObjectUnionDataView>(
+      pod1, false, nullptr);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  mojo::internal::Serialize<ObjectUnionPtr>(pod1, &buf, &data, false, nullptr);
+  mojo::internal::Serialize<ObjectUnionDataView>(pod1, &buf, &data, false,
+                                                 nullptr);
 
   ObjectUnionPtr pod2;
-  mojo::internal::Deserialize<ObjectUnionPtr>(data, &pod2, nullptr);
+  mojo::internal::Deserialize<ObjectUnionDataView>(data, &pod2, nullptr);
   EXPECT_EQ(hello, pod2->get_f_string());
   EXPECT_TRUE(pod2->is_f_string());
   EXPECT_EQ(pod2->which(), ObjectUnion::Tag::F_STRING);
@@ -434,17 +437,19 @@ TEST(UnionTest, PodUnionInArraySerialization) {
   EXPECT_EQ(2U, array.size());
 
   size_t size =
-      mojo::internal::PrepareToSerialize<Array<PodUnionPtr>>(array, nullptr);
+      mojo::internal::PrepareToSerialize<ArrayDataView<PodUnionDataView>>(
+          array, nullptr);
   EXPECT_EQ(40U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   mojo::internal::Array_Data<internal::PodUnion_Data>* data;
   mojo::internal::ContainerValidateParams validate_params(0, false, nullptr);
-  mojo::internal::Serialize<Array<PodUnionPtr>>(array, &buf, &data,
-                                                &validate_params, nullptr);
+  mojo::internal::Serialize<ArrayDataView<PodUnionDataView>>(
+      array, &buf, &data, &validate_params, nullptr);
 
   Array<PodUnionPtr> array2;
-  mojo::internal::Deserialize<Array<PodUnionPtr>>(data, &array2, nullptr);
+  mojo::internal::Deserialize<ArrayDataView<PodUnionDataView>>(data, &array2,
+                                                               nullptr);
 
   EXPECT_EQ(2U, array2.size());
 
@@ -460,17 +465,19 @@ TEST(UnionTest, PodUnionInArraySerializationWithNull) {
   EXPECT_EQ(2U, array.size());
 
   size_t size =
-      mojo::internal::PrepareToSerialize<Array<PodUnionPtr>>(array, nullptr);
+      mojo::internal::PrepareToSerialize<ArrayDataView<PodUnionDataView>>(
+          array, nullptr);
   EXPECT_EQ(40U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   mojo::internal::Array_Data<internal::PodUnion_Data>* data;
   mojo::internal::ContainerValidateParams validate_params(0, true, nullptr);
-  mojo::internal::Serialize<Array<PodUnionPtr>>(array, &buf, &data,
-                                                &validate_params, nullptr);
+  mojo::internal::Serialize<ArrayDataView<PodUnionDataView>>(
+      array, &buf, &data, &validate_params, nullptr);
 
   Array<PodUnionPtr> array2;
-  mojo::internal::Deserialize<Array<PodUnionPtr>>(data, &array2, nullptr);
+  mojo::internal::Deserialize<ArrayDataView<PodUnionDataView>>(data, &array2,
+                                                               nullptr);
 
   EXPECT_EQ(2U, array2.size());
 
@@ -488,15 +495,16 @@ TEST(UnionTest, ObjectUnionInArraySerialization) {
   EXPECT_EQ(2U, array.size());
 
   size_t size =
-      mojo::internal::PrepareToSerialize<Array<ObjectUnionPtr>>(array, nullptr);
+      mojo::internal::PrepareToSerialize<ArrayDataView<ObjectUnionDataView>>(
+          array, nullptr);
   EXPECT_EQ(72U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
 
   mojo::internal::Array_Data<internal::ObjectUnion_Data>* data;
   mojo::internal::ContainerValidateParams validate_params(0, false, nullptr);
-  mojo::internal::Serialize<Array<ObjectUnionPtr>>(array, &buf, &data,
-                                                   &validate_params, nullptr);
+  mojo::internal::Serialize<ArrayDataView<ObjectUnionDataView>>(
+      array, &buf, &data, &validate_params, nullptr);
 
   std::vector<char> new_buf;
   new_buf.resize(size);
@@ -514,7 +522,8 @@ TEST(UnionTest, ObjectUnionInArraySerialization) {
       data, &validation_context, &validate_params));
 
   Array<ObjectUnionPtr> array2;
-  mojo::internal::Deserialize<Array<ObjectUnionPtr>>(data, &array2, nullptr);
+  mojo::internal::Deserialize<ArrayDataView<ObjectUnionDataView>>(data, &array2,
+                                                                  nullptr);
 
   EXPECT_EQ(2U, array2.size());
 
@@ -540,16 +549,17 @@ TEST(UnionTest, Serialization_UnionOfPods) {
   small_struct->pod_union->set_f_int32(10);
 
   mojo::internal::SerializationContext context;
-  size_t size = mojo::internal::PrepareToSerialize<SmallStructPtr>(small_struct,
-                                                                   &context);
+  size_t size = mojo::internal::PrepareToSerialize<SmallStructDataView>(
+      small_struct, &context);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallStruct_Data* data = nullptr;
-  mojo::internal::Serialize<SmallStructPtr>(small_struct, &buf, &data,
-                                            &context);
+  mojo::internal::Serialize<SmallStructDataView>(small_struct, &buf, &data,
+                                                 &context);
 
   SmallStructPtr deserialized;
-  mojo::internal::Deserialize<SmallStructPtr>(data, &deserialized, &context);
+  mojo::internal::Deserialize<SmallStructDataView>(data, &deserialized,
+                                                   &context);
 
   EXPECT_EQ(10, deserialized->pod_union->get_f_int32());
 }
@@ -561,16 +571,17 @@ TEST(UnionTest, Serialization_UnionOfObjects) {
   String hello("hello world");
   obj_struct->obj_union->set_f_string(hello);
 
-  size_t size = mojo::internal::PrepareToSerialize<SmallObjStructPtr>(
+  size_t size = mojo::internal::PrepareToSerialize<SmallObjStructDataView>(
       obj_struct, nullptr);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallObjStruct_Data* data = nullptr;
-  mojo::internal::Serialize<SmallObjStructPtr>(obj_struct, &buf, &data,
-                                               nullptr);
+  mojo::internal::Serialize<SmallObjStructDataView>(obj_struct, &buf, &data,
+                                                    nullptr);
 
   SmallObjStructPtr deserialized;
-  mojo::internal::Deserialize<SmallObjStructPtr>(data, &deserialized, nullptr);
+  mojo::internal::Deserialize<SmallObjStructDataView>(data, &deserialized,
+                                                      nullptr);
 
   EXPECT_EQ(hello, deserialized->obj_union->get_f_string());
 }
@@ -582,14 +593,13 @@ TEST(UnionTest, Validation_UnionsInStruct) {
   small_struct->pod_union->set_f_int32(10);
 
   mojo::internal::SerializationContext context;
-  size_t size = mojo::internal::PrepareToSerialize<SmallStructPtr>(small_struct,
-                                                                   &context);
+  size_t size = mojo::internal::PrepareToSerialize<SmallStructDataView>(
+      small_struct, &context);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallStruct_Data* data = nullptr;
-  mojo::internal::Serialize<SmallStructPtr>(small_struct, &buf, &data,
-                                            &context);
-
+  mojo::internal::Serialize<SmallStructDataView>(small_struct, &buf, &data,
+                                                 &context);
 
   void* raw_buf = buf.Leak();
   mojo::internal::ValidationContext validation_context(
@@ -606,13 +616,13 @@ TEST(UnionTest, Validation_PodUnionInStruct_Failure) {
   small_struct->pod_union->set_f_int32(10);
 
   mojo::internal::SerializationContext context;
-  size_t size = mojo::internal::PrepareToSerialize<SmallStructPtr>(small_struct,
-                                                                   &context);
+  size_t size = mojo::internal::PrepareToSerialize<SmallStructDataView>(
+      small_struct, &context);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallStruct_Data* data = nullptr;
-  mojo::internal::Serialize<SmallStructPtr>(small_struct, &buf, &data,
-                                            &context);
+  mojo::internal::Serialize<SmallStructDataView>(small_struct, &buf, &data,
+                                                 &context);
   data->pod_union.tag = static_cast<internal::PodUnion_Data::PodUnion_Tag>(100);
 
   void* raw_buf = buf.Leak();
@@ -629,7 +639,7 @@ TEST(UnionTest, Validation_NullUnion_Failure) {
       SmallStructNonNullableUnion::New());
 
   size_t size =
-      mojo::internal::PrepareToSerialize<SmallStructNonNullableUnionPtr>(
+      mojo::internal::PrepareToSerialize<SmallStructNonNullableUnionDataView>(
           small_struct, nullptr);
 
   mojo::internal::FixedBufferForTesting buf(size);
@@ -649,13 +659,13 @@ TEST(UnionTest, Validation_NullableUnion) {
   SmallStructPtr small_struct(SmallStruct::New());
 
   mojo::internal::SerializationContext context;
-  size_t size = mojo::internal::PrepareToSerialize<SmallStructPtr>(small_struct,
-                                                                   &context);
+  size_t size = mojo::internal::PrepareToSerialize<SmallStructDataView>(
+      small_struct, &context);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallStruct_Data* data = nullptr;
-  mojo::internal::Serialize<SmallStructPtr>(small_struct, &buf, &data,
-                                            &context);
+  mojo::internal::Serialize<SmallStructDataView>(small_struct, &buf, &data,
+                                                 &context);
 
   void* raw_buf = buf.Leak();
   mojo::internal::ValidationContext validation_context(
@@ -681,6 +691,8 @@ TEST(UnionTest, PodUnionInMap) {
 }
 
 TEST(UnionTest, PodUnionInMapSerialization) {
+  using MojomType = MapDataView<StringDataView, PodUnionDataView>;
+
   Map<String, PodUnionPtr> map;
   map.insert("one", PodUnion::New());
   map.insert("two", PodUnion::New());
@@ -689,27 +701,28 @@ TEST(UnionTest, PodUnionInMapSerialization) {
   map["two"]->set_f_int16(16);
 
   mojo::internal::SerializationContext context;
-  size_t size = mojo::internal::PrepareToSerialize<Map<String, PodUnionPtr>>(
-      map, &context);
+  size_t size = mojo::internal::PrepareToSerialize<MojomType>(map, &context);
   EXPECT_EQ(120U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
-  typename mojo::internal::MojomTypeTraits<Map<String, PodUnionPtr>>::Data*
-      data;
+
+  typename mojo::internal::MojomTypeTraits<MojomType>::Data* data;
   mojo::internal::ContainerValidateParams validate_params(
       new mojo::internal::ContainerValidateParams(0, false, nullptr),
       new mojo::internal::ContainerValidateParams(0, false, nullptr));
-  mojo::internal::Serialize<Map<String, PodUnionPtr>>(
-      map, &buf, &data, &validate_params, &context);
+  mojo::internal::Serialize<MojomType>(map, &buf, &data, &validate_params,
+                                       &context);
 
   Map<String, PodUnionPtr> map2;
-  mojo::internal::Deserialize<Map<String, PodUnionPtr>>(data, &map2, &context);
+  mojo::internal::Deserialize<MojomType>(data, &map2, &context);
 
   EXPECT_EQ(8, map2["one"]->get_f_int8());
   EXPECT_EQ(16, map2["two"]->get_f_int16());
 }
 
 TEST(UnionTest, PodUnionInMapSerializationWithNull) {
+  using MojomType = MapDataView<StringDataView, PodUnionDataView>;
+
   Map<String, PodUnionPtr> map;
   map.insert("one", PodUnion::New());
   map.insert("two", nullptr);
@@ -717,21 +730,19 @@ TEST(UnionTest, PodUnionInMapSerializationWithNull) {
   map["one"]->set_f_int8(8);
 
   mojo::internal::SerializationContext context;
-  size_t size = mojo::internal::PrepareToSerialize<Map<String, PodUnionPtr>>(
-      map, &context);
+  size_t size = mojo::internal::PrepareToSerialize<MojomType>(map, &context);
   EXPECT_EQ(120U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
-  typename mojo::internal::MojomTypeTraits<Map<String, PodUnionPtr>>::Data*
-      data;
+  typename mojo::internal::MojomTypeTraits<MojomType>::Data* data;
   mojo::internal::ContainerValidateParams validate_params(
       new mojo::internal::ContainerValidateParams(0, false, nullptr),
       new mojo::internal::ContainerValidateParams(0, true, nullptr));
-  mojo::internal::Serialize<Map<String, PodUnionPtr>>(
-      map, &buf, &data, &validate_params, &context);
+  mojo::internal::Serialize<MojomType>(map, &buf, &data, &validate_params,
+                                       &context);
 
   Map<String, PodUnionPtr> map2;
-  mojo::internal::Deserialize<Map<String, PodUnionPtr>>(data, &map2, &context);
+  mojo::internal::Deserialize<MojomType>(data, &map2, &context);
 
   EXPECT_EQ(8, map2["one"]->get_f_int8());
   EXPECT_TRUE(map2["two"].is_null());
@@ -754,16 +765,17 @@ TEST(UnionTest, StructInUnionSerialization) {
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_dummy(std::move(dummy));
 
-  size_t size =
-      mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
+  size_t size = mojo::internal::PrepareToSerialize<ObjectUnionDataView>(
+      obj, false, nullptr);
   EXPECT_EQ(32U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
+  mojo::internal::Serialize<ObjectUnionDataView>(obj, &buf, &data, false,
+                                                 nullptr);
 
   ObjectUnionPtr obj2;
-  mojo::internal::Deserialize<ObjectUnionPtr>(data, &obj2, nullptr);
+  mojo::internal::Deserialize<ObjectUnionDataView>(data, &obj2, nullptr);
   EXPECT_EQ(8, obj2->get_f_dummy()->f_int8);
 }
 
@@ -774,12 +786,13 @@ TEST(UnionTest, StructInUnionValidation) {
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_dummy(std::move(dummy));
 
-  size_t size =
-      mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
+  size_t size = mojo::internal::PrepareToSerialize<ObjectUnionDataView>(
+      obj, false, nullptr);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
+  mojo::internal::Serialize<ObjectUnionDataView>(obj, &buf, &data, false,
+                                                 nullptr);
 
   void* raw_buf = buf.Leak();
   mojo::internal::ValidationContext validation_context(
@@ -797,12 +810,13 @@ TEST(UnionTest, StructInUnionValidationNonNullable) {
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_dummy(std::move(dummy));
 
-  size_t size =
-      mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
+  size_t size = mojo::internal::PrepareToSerialize<ObjectUnionDataView>(
+      obj, false, nullptr);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
+  mojo::internal::Serialize<ObjectUnionDataView>(obj, &buf, &data, false,
+                                                 nullptr);
 
   void* raw_buf = buf.Leak();
   mojo::internal::ValidationContext validation_context(
@@ -818,12 +832,13 @@ TEST(UnionTest, StructInUnionValidationNullable) {
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_nullable(std::move(dummy));
 
-  size_t size =
-      mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
+  size_t size = mojo::internal::PrepareToSerialize<ObjectUnionDataView>(
+      obj, false, nullptr);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
+  mojo::internal::Serialize<ObjectUnionDataView>(obj, &buf, &data, false,
+                                                 nullptr);
 
   void* raw_buf = buf.Leak();
   mojo::internal::ValidationContext validation_context(
@@ -853,16 +868,17 @@ TEST(UnionTest, ArrayInUnionSerialization) {
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_array_int8(std::move(array));
 
-  size_t size =
-      mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
+  size_t size = mojo::internal::PrepareToSerialize<ObjectUnionDataView>(
+      obj, false, nullptr);
   EXPECT_EQ(32U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
+  mojo::internal::Serialize<ObjectUnionDataView>(obj, &buf, &data, false,
+                                                 nullptr);
 
   ObjectUnionPtr obj2;
-  mojo::internal::Deserialize<ObjectUnionPtr>(data, &obj2, nullptr);
+  mojo::internal::Deserialize<ObjectUnionDataView>(data, &obj2, nullptr);
 
   EXPECT_EQ(8, obj2->get_f_array_int8()[0]);
   EXPECT_EQ(9, obj2->get_f_array_int8()[1]);
@@ -876,11 +892,12 @@ TEST(UnionTest, ArrayInUnionValidation) {
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_array_int8(std::move(array));
 
-  size_t size =
-      mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
+  size_t size = mojo::internal::PrepareToSerialize<ObjectUnionDataView>(
+      obj, false, nullptr);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
+  mojo::internal::Serialize<ObjectUnionDataView>(obj, &buf, &data, false,
+                                                 nullptr);
 
   void* raw_buf = buf.Leak();
   mojo::internal::ValidationContext validation_context(
@@ -912,16 +929,17 @@ TEST(UnionTest, MapInUnionSerialization) {
   obj->set_f_map_int8(std::move(map));
 
   mojo::internal::SerializationContext context;
-  size_t size =
-      mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, &context);
+  size_t size = mojo::internal::PrepareToSerialize<ObjectUnionDataView>(
+      obj, false, &context);
   EXPECT_EQ(112U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, &context);
+  mojo::internal::Serialize<ObjectUnionDataView>(obj, &buf, &data, false,
+                                                 &context);
 
   ObjectUnionPtr obj2;
-  mojo::internal::Deserialize<ObjectUnionPtr>(data, &obj2, &context);
+  mojo::internal::Deserialize<ObjectUnionDataView>(data, &obj2, &context);
 
   EXPECT_EQ(1, obj2->get_f_map_int8()["one"]);
   EXPECT_EQ(2, obj2->get_f_map_int8()["two"]);
@@ -936,13 +954,14 @@ TEST(UnionTest, MapInUnionValidation) {
   obj->set_f_map_int8(std::move(map));
 
   mojo::internal::SerializationContext context;
-  size_t size =
-      mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, &context);
+  size_t size = mojo::internal::PrepareToSerialize<ObjectUnionDataView>(
+      obj, false, &context);
   EXPECT_EQ(112U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, &context);
+  mojo::internal::Serialize<ObjectUnionDataView>(obj, &buf, &data, false,
+                                                 &context);
 
   void* raw_buf = buf.Leak();
   mojo::internal::ValidationContext validation_context(
@@ -970,16 +989,17 @@ TEST(UnionTest, UnionInUnionSerialization) {
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_pod_union(std::move(pod));
 
-  size_t size =
-      mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
+  size_t size = mojo::internal::PrepareToSerialize<ObjectUnionDataView>(
+      obj, false, nullptr);
   EXPECT_EQ(32U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
+  mojo::internal::Serialize<ObjectUnionDataView>(obj, &buf, &data, false,
+                                                 nullptr);
 
   ObjectUnionPtr obj2;
-  mojo::internal::Deserialize<ObjectUnionPtr>(data, &obj2, nullptr);
+  mojo::internal::Deserialize<ObjectUnionDataView>(data, &obj2, nullptr);
   EXPECT_EQ(10, obj2->get_f_pod_union()->get_f_int8());
 }
 
@@ -990,13 +1010,14 @@ TEST(UnionTest, UnionInUnionValidation) {
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_pod_union(std::move(pod));
 
-  size_t size =
-      mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
+  size_t size = mojo::internal::PrepareToSerialize<ObjectUnionDataView>(
+      obj, false, nullptr);
   EXPECT_EQ(32U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
+  mojo::internal::Serialize<ObjectUnionDataView>(obj, &buf, &data, false,
+                                                 nullptr);
 
   void* raw_buf = buf.Leak();
   mojo::internal::ValidationContext validation_context(
@@ -1014,12 +1035,13 @@ TEST(UnionTest, UnionInUnionValidationNonNullable) {
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_pod_union(std::move(pod));
 
-  size_t size =
-      mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
+  size_t size = mojo::internal::PrepareToSerialize<ObjectUnionDataView>(
+      obj, false, nullptr);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
-  mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
+  mojo::internal::Serialize<ObjectUnionDataView>(obj, &buf, &data, false,
+                                                 nullptr);
 
   void* raw_buf = buf.Leak();
   mojo::internal::ValidationContext validation_context(
@@ -1057,18 +1079,18 @@ TEST(UnionTest, HandleInUnionSerialization) {
   handle->set_f_message_pipe(std::move(pipe1));
 
   mojo::internal::SerializationContext context;
-  size_t size = mojo::internal::PrepareToSerialize<HandleUnionPtr>(
+  size_t size = mojo::internal::PrepareToSerialize<HandleUnionDataView>(
       handle, false, &context);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::HandleUnion_Data* data = nullptr;
-  mojo::internal::Serialize<HandleUnionPtr>(handle, &buf, &data, false,
-                                            &context);
+  mojo::internal::Serialize<HandleUnionDataView>(handle, &buf, &data, false,
+                                                 &context);
   EXPECT_EQ(1U, context.handles.size());
 
   HandleUnionPtr handle2(HandleUnion::New());
-  mojo::internal::Deserialize<HandleUnionPtr>(data, &handle2, &context);
+  mojo::internal::Deserialize<HandleUnionDataView>(data, &handle2, &context);
 
   std::string golden("hello world");
   WriteTextMessage(pipe0.get(), golden);
@@ -1089,14 +1111,14 @@ TEST(UnionTest, HandleInUnionValidation) {
   handle->set_f_message_pipe(std::move(pipe1));
 
   mojo::internal::SerializationContext context;
-  size_t size = mojo::internal::PrepareToSerialize<HandleUnionPtr>(
+  size_t size = mojo::internal::PrepareToSerialize<HandleUnionDataView>(
       handle, false, &context);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::HandleUnion_Data* data = nullptr;
-  mojo::internal::Serialize<HandleUnionPtr>(handle, &buf, &data, false,
-                                            &context);
+  mojo::internal::Serialize<HandleUnionDataView>(handle, &buf, &data, false,
+                                                 &context);
 
   void* raw_buf = buf.Leak();
   mojo::internal::ValidationContext validation_context(
@@ -1114,14 +1136,14 @@ TEST(UnionTest, HandleInUnionValidationNull) {
   handle->set_f_message_pipe(std::move(pipe));
 
   mojo::internal::SerializationContext context;
-  size_t size = mojo::internal::PrepareToSerialize<HandleUnionPtr>(
+  size_t size = mojo::internal::PrepareToSerialize<HandleUnionDataView>(
       handle, false, &context);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::HandleUnion_Data* data = nullptr;
-  mojo::internal::Serialize<HandleUnionPtr>(handle, &buf, &data, false,
-                                            &context);
+  mojo::internal::Serialize<HandleUnionDataView>(handle, &buf, &data, false,
+                                                 &context);
 
   void* raw_buf = buf.Leak();
   mojo::internal::ValidationContext validation_context(
@@ -1176,18 +1198,18 @@ TEST(UnionTest, InterfaceInUnionSerialization) {
   mojo::internal::SerializationContext context;
   HandleUnionPtr handle(HandleUnion::New());
   handle->set_f_small_cache(std::move(ptr));
-  size_t size = mojo::internal::PrepareToSerialize<HandleUnionPtr>(
+  size_t size = mojo::internal::PrepareToSerialize<HandleUnionDataView>(
       handle, false, &context);
   EXPECT_EQ(16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::HandleUnion_Data* data = nullptr;
-  mojo::internal::Serialize<HandleUnionPtr>(handle, &buf, &data, false,
-                                            &context);
+  mojo::internal::Serialize<HandleUnionDataView>(handle, &buf, &data, false,
+                                                 &context);
   EXPECT_EQ(1U, context.handles.size());
 
   HandleUnionPtr handle2(HandleUnion::New());
-  mojo::internal::Deserialize<HandleUnionPtr>(data, &handle2, &context);
+  mojo::internal::Deserialize<HandleUnionDataView>(data, &handle2, &context);
 
   handle2->get_f_small_cache()->SetIntValue(10);
   run_loop.Run();