Mojo C++ bindings: Merge EncodePointers/DecodePointers into Serialize/Deserialize, respectively.

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 152 matching lines @@
   PodUnionPtr pod(PodUnion::New());
   pod->set_f_int8(10);
 
   size_t size =
       mojo::internal::PrepareToSerialize<PodUnionPtr>(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);
-  data->EncodePointers();
 
   void* raw_buf = buf.Leak();
   mojo::internal::ValidationContext validation_context(
       data, static_cast<uint32_t>(size), 0);
   EXPECT_TRUE(
       internal::PodUnion_Data::Validate(raw_buf, &validation_context, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, SerializeNotNull) {
@@ skipping 165 matching lines @@
 
   String hello("hello world");
   pod1->set_f_string(hello);
 
   size_t size =
       mojo::internal::PrepareToSerialize<ObjectUnionPtr>(pod1, false, nullptr);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
   mojo::internal::Serialize<ObjectUnionPtr>(pod1, &buf, &data, false, nullptr);
 
-  data->EncodePointers();
-  data->DecodePointers();
-
   ObjectUnionPtr pod2;
   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);
@@ skipping 123 matching lines @@
       mojo::internal::PrepareToSerialize<Array<ObjectUnionPtr>>(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);
 
-  data->EncodePointers();
-
   std::vector<char> new_buf;
   new_buf.resize(size);
 
   void* raw_buf = buf.Leak();
   memcpy(new_buf.data(), raw_buf, size);
   free(raw_buf);
 
   data =
       reinterpret_cast<mojo::internal::Array_Data<internal::ObjectUnion_Data>*>(
           new_buf.data());
   mojo::internal::ValidationContext validation_context(
       data, static_cast<uint32_t>(size), 0);
   ASSERT_TRUE(mojo::internal::Array_Data<internal::ObjectUnion_Data>::Validate(
       data, &validation_context, &validate_params));
 
-  data->DecodePointers();
   Array<ObjectUnionPtr> array2;
   mojo::internal::Deserialize<Array<ObjectUnionPtr>>(data, &array2, nullptr);
 
   EXPECT_EQ(2U, array2.size());
 
   EXPECT_EQ(String("hello"), array2[0]->get_f_string());
   EXPECT_EQ(String("world"), array2[1]->get_f_string());
 }
 
 // TODO(azani): Move back in struct_unittest.cc when possible.
@@ skipping 36 matching lines @@
   obj_struct->obj_union->set_f_string(hello);
 
   size_t size = mojo::internal::PrepareToSerialize<SmallObjStructPtr>(
       obj_struct, nullptr);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallObjStruct_Data* data = nullptr;
   mojo::internal::Serialize<SmallObjStructPtr>(obj_struct, &buf, &data,
                                                nullptr);
 
-  data->EncodePointers();
-  data->DecodePointers();
-
   SmallObjStructPtr deserialized;
   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 = mojo::internal::PrepareToSerialize<SmallStructPtr>(small_struct,
                                                                    &context);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallStruct_Data* data = nullptr;
   mojo::internal::Serialize<SmallStructPtr>(small_struct, &buf, &data,
                                             &context);
 
-  data->EncodePointers();
 
   void* raw_buf = buf.Leak();
   mojo::internal::ValidationContext validation_context(
       data, static_cast<uint32_t>(size), 0);
   EXPECT_TRUE(internal::SmallStruct_Data::Validate(
       raw_buf, &validation_context));
   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 = mojo::internal::PrepareToSerialize<SmallStructPtr>(small_struct,
                                                                    &context);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallStruct_Data* data = nullptr;
   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::ValidationContext validation_context(
       data, static_cast<uint32_t>(size), 0);
   EXPECT_FALSE(internal::SmallStruct_Data::Validate(
       raw_buf, &validation_context));
   free(raw_buf);
 }
 
 // Validation fails due to non-nullable null union in struct.
 TEST(UnionTest, Validation_NullUnion_Failure) {
@@ skipping 22 matching lines @@
 
   mojo::internal::SerializationContext context;
   size_t size = mojo::internal::PrepareToSerialize<SmallStructPtr>(small_struct,
                                                                    &context);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallStruct_Data* data = nullptr;
   mojo::internal::Serialize<SmallStructPtr>(small_struct, &buf, &data,
                                             &context);
 
-  data->EncodePointers();
-
   void* raw_buf = buf.Leak();
   mojo::internal::ValidationContext validation_context(
       data, static_cast<uint32_t>(size), 0);
   EXPECT_TRUE(internal::SmallStruct_Data::Validate(
       raw_buf, &validation_context));
   free(raw_buf);
 }
 
 // TODO(azani): Move back in map_unittest.cc when possible.
 // Map Tests
@@ skipping 17 matching lines @@
 
   map["one"]->set_f_int8(8);
   map["two"]->set_f_int16(16);
 
   mojo::internal::SerializationContext context;
   size_t size = mojo::internal::PrepareToSerialize<Map<String, PodUnionPtr>>(
       map, &context);
   EXPECT_EQ(120U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
-  mojo::internal::Map_Data<mojo::internal::String_Data*,
-                           internal::PodUnion_Data>* data;
+  typename mojo::internal::MojomTypeTraits<Map<String, PodUnionPtr>>::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);
 
   Map<String, PodUnionPtr> map2;
   mojo::internal::Deserialize<Map<String, PodUnionPtr>>(data, &map2, &context);
 
   EXPECT_EQ(8, map2["one"]->get_f_int8());
   EXPECT_EQ(16, map2["two"]->get_f_int16());
 }
 
 TEST(UnionTest, PodUnionInMapSerializationWithNull) {
   Map<String, PodUnionPtr> map;
   map.insert("one", PodUnion::New());
   map.insert("two", nullptr);
 
   map["one"]->set_f_int8(8);
 
   mojo::internal::SerializationContext context;
   size_t size = mojo::internal::PrepareToSerialize<Map<String, PodUnionPtr>>(
       map, &context);
   EXPECT_EQ(120U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
-  mojo::internal::Map_Data<mojo::internal::String_Data*,
-                           internal::PodUnion_Data>* data;
+  typename mojo::internal::MojomTypeTraits<Map<String, PodUnionPtr>>::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);
 
   Map<String, PodUnionPtr> map2;
   mojo::internal::Deserialize<Map<String, PodUnionPtr>>(data, &map2, &context);
 
   EXPECT_EQ(8, map2["one"]->get_f_int8());
@@ skipping 18 matching lines @@
   obj->set_f_dummy(std::move(dummy));
 
   size_t size =
       mojo::internal::PrepareToSerialize<ObjectUnionPtr>(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);
 
-  data->EncodePointers();
-  data->DecodePointers();
-
   ObjectUnionPtr obj2;
   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 =
       mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
   mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
 
-  data->EncodePointers();
-
   void* raw_buf = buf.Leak();
   mojo::internal::ValidationContext validation_context(
       data, static_cast<uint32_t>(size), 0);
   EXPECT_TRUE(internal::ObjectUnion_Data::Validate(
       raw_buf, &validation_context, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, StructInUnionValidationNonNullable) {
   mojo::internal::SerializationWarningObserverForTesting suppress_warning;
 
   DummyStructPtr dummy(nullptr);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_dummy(std::move(dummy));
 
   size_t size =
       mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
   mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
-  data->EncodePointers();
 
   void* raw_buf = buf.Leak();
   mojo::internal::ValidationContext validation_context(
       data, static_cast<uint32_t>(size), 0);
   EXPECT_FALSE(internal::ObjectUnion_Data::Validate(
       raw_buf, &validation_context, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, StructInUnionValidationNullable) {
   DummyStructPtr dummy(nullptr);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_nullable(std::move(dummy));
 
   size_t size =
       mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
   mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
 
-  data->EncodePointers();
-
   void* raw_buf = buf.Leak();
   mojo::internal::ValidationContext validation_context(
       data, static_cast<uint32_t>(size), 0);
   EXPECT_TRUE(internal::ObjectUnion_Data::Validate(
       raw_buf, &validation_context, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, ArrayInUnionGetterSetter) {
   Array<int8_t> array(2);
@@ skipping 16 matching lines @@
   obj->set_f_array_int8(std::move(array));
 
   size_t size =
       mojo::internal::PrepareToSerialize<ObjectUnionPtr>(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);
 
-  data->EncodePointers();
-  data->DecodePointers();
-
   ObjectUnionPtr obj2;
   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 =
       mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
   mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
 
-  data->EncodePointers();
-
   void* raw_buf = buf.Leak();
   mojo::internal::ValidationContext validation_context(
       data, static_cast<uint32_t>(size), 0);
 
   EXPECT_TRUE(internal::ObjectUnion_Data::Validate(
       raw_buf, &validation_context, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, MapInUnionGetterSetter) {
@@ skipping 18 matching lines @@
 
   mojo::internal::SerializationContext 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;
   mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, &context);
 
-  data->EncodePointers();
-  data->DecodePointers();
-
   ObjectUnionPtr obj2;
   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 =
       mojo::internal::PrepareToSerialize<ObjectUnionPtr>(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);
 
-  data->EncodePointers();
-
   void* raw_buf = buf.Leak();
   mojo::internal::ValidationContext validation_context(
       data, static_cast<uint32_t>(size), 0);
 
   EXPECT_TRUE(internal::ObjectUnion_Data::Validate(
       raw_buf, &validation_context, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, UnionInUnionGetterSetter) {
@@ skipping 14 matching lines @@
   obj->set_f_pod_union(std::move(pod));
 
   size_t size =
       mojo::internal::PrepareToSerialize<ObjectUnionPtr>(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);
 
-  data->EncodePointers();
-  data->DecodePointers();
-
   ObjectUnionPtr obj2;
   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 =
       mojo::internal::PrepareToSerialize<ObjectUnionPtr>(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);
 
-  data->EncodePointers();
-
   void* raw_buf = buf.Leak();
   mojo::internal::ValidationContext validation_context(
       data, static_cast<uint32_t>(size), 0);
   EXPECT_TRUE(internal::ObjectUnion_Data::Validate(
       raw_buf, &validation_context, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, UnionInUnionValidationNonNullable) {
   mojo::internal::SerializationWarningObserverForTesting suppress_warning;
 
   PodUnionPtr pod(nullptr);
 
   ObjectUnionPtr obj(ObjectUnion::New());
   obj->set_f_pod_union(std::move(pod));
 
   size_t size =
       mojo::internal::PrepareToSerialize<ObjectUnionPtr>(obj, false, nullptr);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::ObjectUnion_Data* data = nullptr;
   mojo::internal::Serialize<ObjectUnionPtr>(obj, &buf, &data, false, nullptr);
-  data->EncodePointers();
 
   void* raw_buf = buf.Leak();
   mojo::internal::ValidationContext validation_context(
       data, static_cast<uint32_t>(size), 0);
   EXPECT_FALSE(internal::ObjectUnion_Data::Validate(
       raw_buf, &validation_context, false));
   free(raw_buf);
 }
 
 TEST(UnionTest, HandleInUnionGetterSetter) {
@@ skipping 184 matching lines @@
 
   PodUnionPtr pod(PodUnion::New());
   pod->set_f_int16(16);
 
   ptr->Echo(std::move(pod), base::Bind(&ExpectInt16, 16));
   run_loop.RunUntilIdle();
 }
 
 }  // namespace test
 }  // namespace mojo