Mojo C++ bindings: custom type mapping for array - part 2

mojo/public/cpp/bindings/tests/map_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 "mojo/public/cpp/bindings/map.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <utility>
 
@@ skipping 275 matching lines @@
     ASSERT_EQ(1u, it->second.size());
     EXPECT_EQ(it->first, it->second.at(0));
   }
 }
 
 TEST_F(MapTest, ArrayOfMap) {
   {
     Array<Map<int32_t, int8_t>> array(1);
     array[0].insert(1, 42);
 
-    size_t size = GetSerializedSize_(array, nullptr);
+    mojo::internal::SerializationContext context;
+    size_t size =
+        mojo::internal::PrepareToSerialize<Array<Map<int32_t, int8_t>>>(
+            array, &context);
     FixedBufferForTesting buf(size);
     Array_Data<Map_Data<int32_t, int8_t>*>* data;
     ArrayValidateParams validate_params(
         0, false, new ArrayValidateParams(0, false, nullptr));
-    SerializeArray_(std::move(array), &buf, &data, &validate_params, nullptr);
+    mojo::internal::Serialize<Array<Map<int32_t, int8_t>>>(
+        array, &buf, &data, &validate_params, &context);
 
     Array<Map<int32_t, int8_t>> deserialized_array;
-    Deserialize_(data, &deserialized_array, nullptr);
+    mojo::internal::Deserialize<Array<Map<int32_t, int8_t>>>(
+        data, &deserialized_array, &context);
 
     ASSERT_EQ(1u, deserialized_array.size());
     ASSERT_EQ(1u, deserialized_array[0].size());
     ASSERT_EQ(42, deserialized_array[0].at(1));
   }
 
   {
     Array<Map<String, Array<bool>>> array(1);
     Array<bool> map_value(2);
     map_value[0] = false;
     map_value[1] = true;
     array[0].insert("hello world", std::move(map_value));
 
-    size_t size = GetSerializedSize_(array, nullptr);
+    mojo::internal::SerializationContext context;
+    size_t size =
+        mojo::internal::PrepareToSerialize<Array<Map<String, Array<bool>>>>(
+            array, &context);
     FixedBufferForTesting buf(size);
     Array_Data<Map_Data<String_Data*, Array_Data<bool>*>*>* data;
     ArrayValidateParams validate_params(
         0, false, new ArrayValidateParams(
                       0, false, new ArrayValidateParams(0, false, nullptr)));
-    SerializeArray_(std::move(array), &buf, &data, &validate_params, nullptr);
+    mojo::internal::Serialize<Array<Map<String, Array<bool>>>>(
+        array, &buf, &data, &validate_params, &context);
 
     Array<Map<String, Array<bool>>> deserialized_array;
-    Deserialize_(data, &deserialized_array, nullptr);
+    mojo::internal::Deserialize<Array<Map<String, Array<bool>>>>(
+        data, &deserialized_array, &context);
 
     ASSERT_EQ(1u, deserialized_array.size());
     ASSERT_EQ(1u, deserialized_array[0].size());
     ASSERT_FALSE(deserialized_array[0].at("hello world")[0]);
     ASSERT_TRUE(deserialized_array[0].at("hello world")[1]);
   }
 }
 
 TEST_F(MapTest, MoveFromAndToSTLMap_Copyable) {
   std::map<int32_t, CopyableType> map1;
@@ skipping 26 matching lines @@
   ASSERT_EQ(1u, map2.size());
   ASSERT_NE(map2.end(), map2.find(123));
 
   ASSERT_EQ(0u, mojo_map.size());
   ASSERT_TRUE(mojo_map.is_null());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace mojo