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

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 41 matching lines @@
 U SerializeAndDeserialize(T input) {
   using InputDataType = typename mojo::internal::MojomTypeTraits<T>::Data*;
   using OutputDataType = typename mojo::internal::MojomTypeTraits<U>::Data*;
 
   mojo::internal::SerializationContext context;
   size_t size = mojo::internal::PrepareToSerialize<T>(input, &context);
   mojo::internal::FixedBufferForTesting buf(size + 32);
   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);
   return std::move(output);
 }
 
 using StructTest = testing::Test;
 
 }  // namespace
 
@@ skipping 387 matching lines @@
         mojo::internal::PrepareToSerialize<NativeStructPtr>(native, nullptr);
     EXPECT_EQ(16u, size);
     mojo::internal::FixedBufferForTesting buf(size);
 
     Data* data = nullptr;
     mojo::internal::Serialize<NativeStructPtr>(std::move(native), &buf, &data,
                                                nullptr);
 
     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());
     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]);
   }
 }
 
@@ skipping 55 matching lines @@
     RectPtr rect = MakeRect();
     mojo::Array<uint8_t> data = Rect::Serialize(&rect);
 
     NamedRegionPtr output;
     EXPECT_FALSE(NamedRegion::Deserialize(std::move(data), &output));
   }
 }
 
 }  // namespace test
 }  // namespace mojo