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

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

Index: mojo/public/cpp/bindings/lib/control_message_proxy.cc
diff --git a/mojo/public/cpp/bindings/lib/control_message_proxy.cc b/mojo/public/cpp/bindings/lib/control_message_proxy.cc
index ed27c070fe07ab3382ff3113605b366d0d8908cc..6189e6973e792f691b9a94fb8cdc7ec329062273 100644
--- a/mojo/public/cpp/bindings/lib/control_message_proxy.cc
+++ b/mojo/public/cpp/bindings/lib/control_message_proxy.cc
@@ -10,6 +10,7 @@
 
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/lib/message_builder.h"
+#include "mojo/public/cpp/bindings/lib/serialization.h"
 #include "mojo/public/cpp/bindings/message.h"
 #include "mojo/public/interfaces/bindings/interface_control_messages.mojom.h"
 
@@ -38,7 +39,8 @@ bool RunResponseForwardToCallback::Accept(Message* message) {
   params->DecodePointers();
 
   RunResponseMessageParamsPtr params_ptr;
-  Deserialize_(params, &params_ptr, nullptr);
+  SerializationContext context;
+  Deserialize<RunResponseMessageParamsPtr>(params, &params_ptr, &context);
 
   callback_.Run(std::move(params_ptr->query_version_result));
   return true;
@@ -46,17 +48,19 @@ bool RunResponseForwardToCallback::Accept(Message* message) {
 
 void SendRunMessage(MessageReceiverWithResponder* receiver,
                     QueryVersionPtr query_version,
-                    const RunCallback& callback) {
+                    const RunCallback& callback,
+                    SerializationContext* context) {
   RunMessageParamsPtr params_ptr(RunMessageParams::New());
   params_ptr->reserved0 = 16u;
   params_ptr->reserved1 = 0u;
   params_ptr->query_version = std::move(query_version);
 
-  size_t size = GetSerializedSize_(params_ptr, nullptr);
+  size_t size = PrepareToSerialize<RunMessageParamsPtr>(params_ptr, context);
   RequestMessageBuilder builder(kRunMessageId, size);
 
   RunMessageParams_Data* params = nullptr;
-  Serialize_(std::move(params_ptr), builder.buffer(), &params, nullptr);
+  Serialize<RunMessageParamsPtr>(params_ptr, builder.buffer(), &params,
+                                 context);
   params->EncodePointers();
   MessageReceiver* responder = new RunResponseForwardToCallback(callback);
   if (!receiver->AcceptWithResponder(builder.message(), responder))
@@ -64,17 +68,20 @@ void SendRunMessage(MessageReceiverWithResponder* receiver,
 }
 
 void SendRunOrClosePipeMessage(MessageReceiverWithResponder* receiver,
-                               RequireVersionPtr require_version) {
+                               RequireVersionPtr require_version,
+                               SerializationContext* context) {
   RunOrClosePipeMessageParamsPtr params_ptr(RunOrClosePipeMessageParams::New());
   params_ptr->reserved0 = 16u;
   params_ptr->reserved1 = 0u;
   params_ptr->require_version = std::move(require_version);
 
-  size_t size = GetSerializedSize_(params_ptr, nullptr);
+  size_t size =
+      PrepareToSerialize<RunOrClosePipeMessageParamsPtr>(params_ptr, context);
   MessageBuilder builder(kRunOrClosePipeMessageId, size);
 
   RunOrClosePipeMessageParams_Data* params = nullptr;
-  Serialize_(std::move(params_ptr), builder.buffer(), &params, nullptr);
+  Serialize<RunOrClosePipeMessageParamsPtr>(params_ptr, builder.buffer(),
+                                            &params, context);
   params->EncodePointers();
   bool ok = receiver->Accept(builder.message());
   ALLOW_UNUSED_LOCAL(ok);
@@ -91,13 +98,13 @@ void ControlMessageProxy::QueryVersion(
   auto run_callback = [callback](QueryVersionResultPtr query_version_result) {
     callback.Run(query_version_result->version);
   };
-  SendRunMessage(receiver_, QueryVersion::New(), run_callback);
+  SendRunMessage(receiver_, QueryVersion::New(), run_callback, &context_);
 }
 
 void ControlMessageProxy::RequireVersion(uint32_t version) {
   RequireVersionPtr require_version(RequireVersion::New());
   require_version->version = version;
-  SendRunOrClosePipeMessage(receiver_, std::move(require_version));
+  SendRunOrClosePipeMessage(receiver_, std::move(require_version), &context_);
 }
 
 }  // namespace internal