Mojo bindings: merge the control messages of sending disconnect reason and notifying endpoint close…

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 1561dfb9a7429631b23844559f81a32a111a73c8..44db40c2ac9065de6fb90b9e37b940438283710d 100644
--- a/mojo/public/cpp/bindings/lib/control_message_proxy.cc
+++ b/mojo/public/cpp/bindings/lib/control_message_proxy.cc
@@ -15,6 +15,7 @@
 #include "mojo/public/cpp/bindings/lib/message_builder.h"
 #include "mojo/public/cpp/bindings/lib/serialization.h"
 #include "mojo/public/cpp/bindings/lib/validation_util.h"
+#include "mojo/public/cpp/bindings/message.h"
 #include "mojo/public/interfaces/bindings/interface_control_messages.mojom.h"
 
 namespace mojo {
@@ -170,14 +171,6 @@ void ControlMessageProxy::FlushForTesting() {
   run_loop.Run();
 }
 
-void ControlMessageProxy::SendDisconnectReason(uint32_t custom_reason,
-                                               const std::string& description) {
-  Message message =
-      ConstructDisconnectReasonMessage(custom_reason, description);
-  bool ok = receiver_->Accept(&message);
-  ALLOW_UNUSED_LOCAL(ok);
-}
-
 void ControlMessageProxy::RunFlushForTestingClosure() {
   DCHECK(!run_loop_quit_closure_.is_null());
   base::ResetAndReturn(&run_loop_quit_closure_).Run();
@@ -189,17 +182,5 @@ void ControlMessageProxy::OnConnectionError() {
     RunFlushForTestingClosure();
 }
 
-// static
-Message ControlMessageProxy::ConstructDisconnectReasonMessage(
-    uint32_t custom_reason,
-    const std::string& description) {
-  auto send_disconnect_reason = interface_control::SendDisconnectReason::New();
-  send_disconnect_reason->custom_reason = custom_reason;
-  send_disconnect_reason->description = description;
-  auto input_ptr = interface_control::RunOrClosePipeInput::New();
-  input_ptr->set_send_disconnect_reason(std::move(send_disconnect_reason));
-  return ConstructRunOrClosePipeMessage(std::move(input_ptr));
-}
-
 }  // namespace internal
 }  // namespace mojo