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

mojo/public/cpp/bindings/tests/array_common_test.h

Index: mojo/public/cpp/bindings/tests/array_common_test.h
diff --git a/mojo/public/cpp/bindings/tests/array_common_test.h b/mojo/public/cpp/bindings/tests/array_common_test.h
index 4adb98657824e6eaae50c312b79614f31bcdbc1f..6b4bcfbf1a48bd06b0005a020001135a57898a2f 100644
--- a/mojo/public/cpp/bindings/tests/array_common_test.h
+++ b/mojo/public/cpp/bindings/tests/array_common_test.h
@@ -215,7 +215,7 @@ class ArrayCommonTest {
     EXPECT_EQ(8U + 2 * 8U + 2 * (8U + 4 * 4U), size);
 
     mojo::internal::FixedBufferForTesting buf(size);
-    mojo::internal::Array_Data<mojo::internal::Array_Data<int32_t>*>* data;
+    typename mojo::internal::MojomTypeTraits<Array<Array<int32_t>>>::Data* data;
     mojo::internal::ContainerValidateParams validate_params(
         0, false,
         new mojo::internal::ContainerValidateParams(0, false, nullptr));
@@ -273,7 +273,7 @@ class ArrayCommonTest {
               size);
 
     mojo::internal::FixedBufferForTesting buf(size);
-    mojo::internal::Array_Data<mojo::internal::String_Data*>* data;
+    typename mojo::internal::MojomTypeTraits<Array<String>>::Data* data;
     mojo::internal::ContainerValidateParams validate_params(
         0, false,
         new mojo::internal::ContainerValidateParams(0, false, nullptr));