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

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

 // Copyright 2016 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 "mojo/public/cpp/bindings/lib/array_internal.h"
 #include "mojo/public/cpp/bindings/lib/fixed_buffer.h"
@@ skipping 197 matching lines @@
       for (size_t i = 0; i < inner.size(); ++i)
         inner[i] = static_cast<int32_t>(i + (j * 10));
       array[j] = std::move(inner);
     }
 
     size_t size = mojo::internal::PrepareToSerialize<Array<Array<int32_t>>>(
         array, nullptr);
     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));
     mojo::internal::Serialize<Array<Array<int32_t>>>(array, &buf, &data,
                                                      &validate_params, nullptr);
 
     ArrayType<ArrayType<int32_t>> array2;
     mojo::internal::Deserialize<Array<Array<int32_t>>>(data, &array2, nullptr);
 
     EXPECT_EQ(2U, array2.size());
@@ skipping 37 matching lines @@
 
     size_t size =
         mojo::internal::PrepareToSerialize<Array<String>>(array, nullptr);
     EXPECT_EQ(8U +            // array header
                   10 * 8U +   // array payload (10 pointers)
                   10 * (8U +  // string header
                         8U),  // string length of 1 padded to 8
               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));
     mojo::internal::Serialize<Array<String>>(array, &buf, &data,
                                              &validate_params, nullptr);
 
     ArrayType<String> array2;
     mojo::internal::Deserialize<Array<String>>(data, &array2, nullptr);
 
     EXPECT_EQ(10U, array2.size());
@@ skipping 108 matching lines @@
   }
 };
 
 #define ARRAY_COMMON_TEST(ArrayType, test_name) \
   TEST_F(ArrayType##Test, test_name) {          \
     ArrayCommonTest<ArrayType>::test_name();    \
   }
 
 }  // namespace test
 }  // namespace mojo