Mojo C++ bindings: switch the remaining callsites of the old serialization interface.

mojo/public/cpp/bindings/tests/struct_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 <string.h>
 #include <utility>
 
 #include "mojo/public/cpp/bindings/lib/fixed_buffer.h"
@@ skipping 38 matching lines @@
 }
 
 template <typename U, typename T>
 U SerializeAndDeserialize(T input) {
   using InputDataType = typename std::remove_pointer<decltype(
       std::declval<T>().get())>::type::Data_*;
   using OutputDataType = typename std::remove_pointer<decltype(
       std::declval<U>().get())>::type::Data_*;
 
   mojo::internal::SerializationContext context;
-  size_t size = GetSerializedSize_(input, &context);
+  size_t size = mojo::internal::PrepareToSerialize<T>(input, &context);
   mojo::internal::FixedBufferForTesting buf(size + 32);
   InputDataType data;
-  Serialize_(std::move(input), &buf, &data, &context);
+  mojo::internal::Serialize<T>(input, &buf, &data, &context);
 
   data->EncodePointers();
 
   // Set the subsequent area to a special value, so that we can find out if we
   // mistakenly access the area.
   void* subsequent_area = buf.Allocate(32);
   memset(subsequent_area, 0xAA, 32);
 
   OutputDataType output_data = reinterpret_cast<OutputDataType>(data);
   output_data->DecodePointers();
 
   U output;
-  Deserialize_(output_data, &output, &context);
+  mojo::internal::Deserialize<U>(output_data, &output, &context);
   return std::move(output);
 }
 
 using StructTest = testing::Test;
 
 }  // namespace
 
 TEST_F(StructTest, Rect) {
   RectPtr rect;
   EXPECT_TRUE(rect.is_null());
@@ skipping 43 matching lines @@
   // NoDefaultFieldValues contains handles, so Clone() is not available, but
   // NoDefaultFieldValuesPtr should still compile.
   NoDefaultFieldValuesPtr no_default_field_values(NoDefaultFieldValues::New());
   EXPECT_FALSE(no_default_field_values->f13.is_valid());
 }
 
 // Serialization test of a struct with no pointer or handle members.
 TEST_F(StructTest, Serialization_Basic) {
   RectPtr rect(MakeRect());
 
-  size_t size = GetSerializedSize_(rect, nullptr);
+  size_t size = mojo::internal::PrepareToSerialize<RectPtr>(rect, nullptr);
   EXPECT_EQ(8U + 16U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::Rect_Data* data;
-  Serialize_(std::move(rect), &buf, &data, nullptr);
+  mojo::internal::Serialize<RectPtr>(rect, &buf, &data, nullptr);
 
   RectPtr rect2;
-  Deserialize_(data, &rect2, nullptr);
+  mojo::internal::Deserialize<RectPtr>(data, &rect2, nullptr);
 
   CheckRect(*rect2);
 }
 
 // Construction of a struct with struct pointers from null.
 TEST_F(StructTest, Construction_StructPointers) {
   RectPairPtr pair;
   EXPECT_TRUE(pair.is_null());
 
   pair = RectPair::New();
   EXPECT_FALSE(pair.is_null());
   EXPECT_TRUE(pair->first.is_null());
   EXPECT_TRUE(pair->first.is_null());
 
   pair = nullptr;
   EXPECT_TRUE(pair.is_null());
 }
 
 // Serialization test of a struct with struct pointers.
 TEST_F(StructTest, Serialization_StructPointers) {
   RectPairPtr pair(RectPair::New());
   pair->first = MakeRect();
   pair->second = MakeRect();
 
-  size_t size = GetSerializedSize_(pair, nullptr);
+  size_t size = mojo::internal::PrepareToSerialize<RectPairPtr>(pair, nullptr);
   EXPECT_EQ(8U + 16U + 2 * (8U + 16U), size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::RectPair_Data* data;
-  Serialize_(std::move(pair), &buf, &data, nullptr);
+  mojo::internal::Serialize<RectPairPtr>(pair, &buf, &data, nullptr);
 
   RectPairPtr pair2;
-  Deserialize_(data, &pair2, nullptr);
+  mojo::internal::Deserialize<RectPairPtr>(data, &pair2, nullptr);
 
   CheckRect(*pair2->first);
   CheckRect(*pair2->second);
 }
 
 // Serialization test of a struct with an array member.
 TEST_F(StructTest, Serialization_ArrayPointers) {
   NamedRegionPtr region(NamedRegion::New());
   region->name = "region";
   region->rects = Array<RectPtr>::New(4);
   for (size_t i = 0; i < region->rects.size(); ++i)
     region->rects[i] = MakeRect(static_cast<int32_t>(i) + 1);
 
-  size_t size = GetSerializedSize_(region, nullptr);
+  size_t size =
+      mojo::internal::PrepareToSerialize<NamedRegionPtr>(region, nullptr);
   EXPECT_EQ(8U +            // header
                 8U +        // name pointer
                 8U +        // rects pointer
                 8U +        // name header
                 8U +        // name payload (rounded up)
                 8U +        // rects header
                 4 * 8U +    // rects payload (four pointers)
                 4 * (8U +   // rect header
                      16U),  // rect payload (four ints)
             size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::NamedRegion_Data* data;
-  Serialize_(std::move(region), &buf, &data, nullptr);
+  mojo::internal::Serialize<NamedRegionPtr>(region, &buf, &data, nullptr);
 
   NamedRegionPtr region2;
-  Deserialize_(data, &region2, nullptr);
+  mojo::internal::Deserialize<NamedRegionPtr>(data, &region2, nullptr);
 
   EXPECT_EQ(String("region"), region2->name);
 
   EXPECT_EQ(4U, region2->rects.size());
   for (size_t i = 0; i < region2->rects.size(); ++i)
     CheckRect(*region2->rects[i], static_cast<int32_t>(i) + 1);
 }
 
 // Serialization test of a struct with null array pointers.
 TEST_F(StructTest, Serialization_NullArrayPointers) {
   NamedRegionPtr region(NamedRegion::New());
   EXPECT_TRUE(region->name.is_null());
   EXPECT_TRUE(region->rects.is_null());
 
-  size_t size = GetSerializedSize_(region, nullptr);
+  size_t size =
+      mojo::internal::PrepareToSerialize<NamedRegionPtr>(region, nullptr);
   EXPECT_EQ(8U +      // header
                 8U +  // name pointer
                 8U,   // rects pointer
             size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::NamedRegion_Data* data;
-  Serialize_(std::move(region), &buf, &data, nullptr);
+  mojo::internal::Serialize<NamedRegionPtr>(region, &buf, &data, nullptr);
 
   NamedRegionPtr region2;
-  Deserialize_(data, &region2, nullptr);
+  mojo::internal::Deserialize<NamedRegionPtr>(data, &region2, nullptr);
 
   EXPECT_TRUE(region2->name.is_null());
   EXPECT_TRUE(region2->rects.is_null());
 }
 
 // Tests deserializing structs as a newer version.
 TEST_F(StructTest, Versioning_OldToNew) {
   {
     MultiVersionStructV0Ptr input(MultiVersionStructV0::New());
     input->f_int32 = 123;
@@ skipping 168 matching lines @@
     EXPECT_TRUE(output->Equals(*expected_output));
   }
 }
 
 // Serialization test for native struct.
 TEST_F(StructTest, Serialization_NativeStruct) {
   using Data = mojo::internal::NativeStruct_Data;
   {
     // Serialization of a null native struct.
     NativeStructPtr native;
-    size_t size = GetSerializedSize_(native, nullptr);
+    size_t size =
+        mojo::internal::PrepareToSerialize<NativeStructPtr>(native, nullptr);
     EXPECT_EQ(0u, size);
     mojo::internal::FixedBufferForTesting buf(size);
 
     Data* data = nullptr;
-    Serialize_(std::move(native), &buf, &data, nullptr);
+    mojo::internal::Serialize<NativeStructPtr>(std::move(native), &buf, &data,
+                                               nullptr);
 
     EXPECT_EQ(nullptr, data);
 
     NativeStructPtr output_native;
-    Deserialize_(data, &output_native, nullptr);
+    mojo::internal::Deserialize<NativeStructPtr>(data, &output_native, nullptr);
     EXPECT_TRUE(output_native.is_null());
   }
 
   {
     // Serialization of a native struct with null data.
     NativeStructPtr native(NativeStruct::New());
-    size_t size = GetSerializedSize_(native, nullptr);
+    size_t size =
+        mojo::internal::PrepareToSerialize<NativeStructPtr>(native, nullptr);
     EXPECT_EQ(0u, size);
     mojo::internal::FixedBufferForTesting buf(size);
 
     Data* data = nullptr;
-    Serialize_(std::move(native), &buf, &data, nullptr);
+    mojo::internal::Serialize<NativeStructPtr>(std::move(native), &buf, &data,
+                                               nullptr);
 
     EXPECT_EQ(nullptr, data);
 
     NativeStructPtr output_native;
-    Deserialize_(data, &output_native, nullptr);
+    mojo::internal::Deserialize<NativeStructPtr>(data, &output_native, nullptr);
     EXPECT_TRUE(output_native.is_null());
   }
 
   {
     NativeStructPtr native(NativeStruct::New());
     native->data = Array<uint8_t>(2);
     native->data[0] = 'X';
     native->data[1] = 'Y';
 
-    size_t size = GetSerializedSize_(native, nullptr);
+    size_t size =
+        mojo::internal::PrepareToSerialize<NativeStructPtr>(native, nullptr);
     EXPECT_EQ(16u, size);
     mojo::internal::FixedBufferForTesting buf(size);
 
     Data* data = nullptr;
-    Serialize_(std::move(native), &buf, &data, nullptr);
+    mojo::internal::Serialize<NativeStructPtr>(std::move(native), &buf, &data,
+                                               nullptr);
 
     EXPECT_NE(nullptr, data);
 
     data->EncodePointers();
     data->DecodePointers();
 
     NativeStructPtr output_native;
-    Deserialize_(data, &output_native, nullptr);
+    mojo::internal::Deserialize<NativeStructPtr>(data, &output_native, nullptr);
     EXPECT_FALSE(output_native.is_null());
     EXPECT_FALSE(output_native->data.is_null());
     EXPECT_EQ(2u, output_native->data.size());
     EXPECT_EQ('X', output_native->data[0]);
     EXPECT_EQ('Y', output_native->data[1]);
   }
 }
 
 }  // namespace test
 }  // namespace mojo