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

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

Index: mojo/public/cpp/bindings/lib/control_message_handler.h
diff --git a/mojo/public/cpp/bindings/lib/control_message_handler.h b/mojo/public/cpp/bindings/lib/control_message_handler.h
index d26bbce1b3c30dff1099c784e125740fe59c13d1..3c385e41d9d76d77a2ad11381a2e45b57dab1a69 100644
--- a/mojo/public/cpp/bindings/lib/control_message_handler.h
+++ b/mojo/public/cpp/bindings/lib/control_message_handler.h
@@ -7,8 +7,6 @@
 
 #include <stdint.h>
 
-#include <string>
-
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/bindings_export.h"
@@ -33,14 +31,6 @@ class MOJO_CPP_BINDINGS_EXPORT ControlMessageHandler
   bool AcceptWithResponder(Message* message,
                            MessageReceiverWithStatus* responder) override;
 
-  uint32_t disconnect_custom_reason() const {
-    return disconnect_custom_reason_;
-  }
-
-  const std::string& disconnect_description() const {
-    return disconnect_description_;
-  }
-
  private:
   bool Run(Message* message, MessageReceiverWithStatus* responder);
   bool RunOrClosePipe(Message* message);
@@ -48,9 +38,6 @@ class MOJO_CPP_BINDINGS_EXPORT ControlMessageHandler
   uint32_t interface_version_;
   SerializationContext context_;
 
-  uint32_t disconnect_custom_reason_ = 0;
-  std::string disconnect_description_;
-
   DISALLOW_COPY_AND_ASSIGN(ControlMessageHandler);
 };