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

mojo/public/cpp/bindings/tests/struct_unittest.cc

Index: mojo/public/cpp/bindings/tests/struct_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/struct_unittest.cc b/mojo/public/cpp/bindings/tests/struct_unittest.cc
index 51459edf5e299412b99e5523ac6eea8565bea3cf..eb6e631a6fbd3d64bdfdd0422b88f48737d8530b 100644
--- a/mojo/public/cpp/bindings/tests/struct_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/struct_unittest.cc
@@ -59,15 +59,12 @@ U SerializeAndDeserialize(T input) {
   InputDataType data;
   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;
   mojo::internal::Deserialize<U>(output_data, &output, &context);
@@ -475,9 +472,6 @@ TEST_F(StructTest, Serialization_NativeStruct) {
 
     EXPECT_NE(nullptr, data);
 
-    data->EncodePointers();
-    data->DecodePointers();
-
     NativeStructPtr output_native;
     mojo::internal::Deserialize<NativeStructPtr>(data, &output_native, nullptr);
     EXPECT_FALSE(output_native.is_null());