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

mojo/public/cpp/bindings/lib/control_message_handler.cc

 // Copyright 2015 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 "mojo/public/cpp/bindings/lib/control_message_handler.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <utility>
 
@@ skipping 45 matching lines @@
   response_params_ptr->query_version_result = QueryVersionResult::New();
   response_params_ptr->query_version_result->version = interface_version_;
 
   size_t size = PrepareToSerialize<RunResponseMessageParamsPtr>(
       response_params_ptr, &context_);
   ResponseMessageBuilder builder(kRunMessageId, size, message->request_id());
 
   RunResponseMessageParams_Data* response_params = nullptr;
   Serialize<RunResponseMessageParamsPtr>(response_params_ptr, builder.buffer(),
                                          &response_params, &context_);
-  response_params->EncodePointers();
   bool ok = responder->Accept(builder.message());
   ALLOW_UNUSED_LOCAL(ok);
   delete responder;
 
   return true;
 }
 
 bool ControlMessageHandler::RunOrClosePipe(Message* message) {
   RunOrClosePipeMessageParams_Data* params =
       reinterpret_cast<RunOrClosePipeMessageParams_Data*>(
           message->mutable_payload());
-  params->DecodePointers();
-
   RunOrClosePipeMessageParamsPtr params_ptr;
   Deserialize<RunOrClosePipeMessageParamsPtr>(params, &params_ptr, &context_);
 
   return interface_version_ >= params_ptr->require_version->version;
 }
 
 }  // namespace internal
 }  // namespace mojo