Mojo C++ bindings: switch the remaining callsites of the old serialization interface.

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

Index: mojo/public/cpp/bindings/lib/control_message_handler.cc
diff --git a/mojo/public/cpp/bindings/lib/control_message_handler.cc b/mojo/public/cpp/bindings/lib/control_message_handler.cc
index fb4bf2617dfd01dfd6a5e53db0e4fdd4b0d83e93..1bcd87daf9ef56103b30255ec0a5ce83c2fd51ad 100644
--- a/mojo/public/cpp/bindings/lib/control_message_handler.cc
+++ b/mojo/public/cpp/bindings/lib/control_message_handler.cc
@@ -10,6 +10,7 @@
 
 #include "base/logging.h"
 #include "mojo/public/cpp/bindings/lib/message_builder.h"
+#include "mojo/public/cpp/bindings/lib/serialization.h"
 #include "mojo/public/interfaces/bindings/interface_control_messages.mojom.h"
 
 namespace mojo {
@@ -55,12 +56,13 @@ bool ControlMessageHandler::Run(Message* message,
   response_params_ptr->query_version_result = QueryVersionResult::New();
   response_params_ptr->query_version_result->version = interface_version_;
 
-  size_t size = GetSerializedSize_(response_params_ptr, nullptr);
+  size_t size = PrepareToSerialize<RunResponseMessageParamsPtr>(
+      response_params_ptr, &context_);
   ResponseMessageBuilder builder(kRunMessageId, size, message->request_id());
 
   RunResponseMessageParams_Data* response_params = nullptr;
-  Serialize_(std::move(response_params_ptr), builder.buffer(), &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);
@@ -76,7 +78,7 @@ bool ControlMessageHandler::RunOrClosePipe(Message* message) {
   params->DecodePointers();
 
   RunOrClosePipeMessageParamsPtr params_ptr;
-  Deserialize_(params, &params_ptr, nullptr);
+  Deserialize<RunOrClosePipeMessageParamsPtr>(params, &params_ptr, &context_);
 
   return interface_version_ >= params_ptr->require_version->version;
 }