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

mojo/public/cpp/bindings/lib/serialization.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.
 
 #ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_SERIALIZATION_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_SERIALIZATION_H_
 
 #include <string.h>
 
 #include "mojo/public/cpp/bindings/array_traits_carray.h"
@@ skipping 40 matching lines @@
     // calloc sets the memory to all zero.
     result_buffer = calloc(size, 1);
     DCHECK(IsAligned(result_buffer));
   }
 
   FixedBuffer buffer;
   buffer.Initialize(result_buffer, size);
   typename MojomType::Struct::Data_* data = nullptr;
   Serialize<MojomType>(*input, &buffer, &data, &context);
 
-  data->EncodePointers();
-
   if (need_copy) {
     memcpy(&result.front(), result_buffer, size);
     free(result_buffer);
   }
 
   return result;
 }
 
 template <typename MojomType, typename DataArrayType, typename UserType>
 bool StructDeserializeImpl(DataArrayType input, UserType* output) {
@@ skipping 12 matching lines @@
   if (need_copy) {
     input_buffer = malloc(input.size());
     DCHECK(IsAligned(input_buffer));
     memcpy(input_buffer, &input.front(), input.size());
   }
 
   ValidationContext validation_context(input_buffer, input.size(), 0);
   bool result = false;
   if (DataType::Validate(input_buffer, &validation_context)) {
     auto data = reinterpret_cast<DataType*>(input_buffer);
-    if (data)
-      data->DecodePointers();
-
     SerializationContext context;
     result = Deserialize<MojomType>(data, output, &context);
   }
 
   if (need_copy)
     free(input_buffer);
 
   return result;
 }
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_SERIALIZATION_H_