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

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

 // 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.
 
 #ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_ASSOCIATED_INTERFACE_PTR_STATE_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_ASSOCIATED_INTERFACE_PTR_STATE_H_
 
 #include <stdint.h>
 
 #include <algorithm>  // For |std::swap()|.
@@ skipping 56 matching lines @@
       return;
 
     version_ = version;
     endpoint_client_->control_message_proxy()->RequireVersion(version);
   }
 
   void FlushForTesting() {
     endpoint_client_->control_message_proxy()->FlushForTesting();
   }
 
-  void SendDisconnectReason(uint32_t custom_reason,
-                            const std::string& description) {
-    endpoint_client_->control_message_proxy()->SendDisconnectReason(
-        custom_reason, description);
+  void CloseWithReason(uint32_t custom_reason, const std::string& description) {
+    endpoint_client_->CloseWithReason(custom_reason, description);
   }
 
   void Swap(AssociatedInterfacePtrState* other) {
     using std::swap;
     swap(other->endpoint_client_, endpoint_client_);
     swap(other->proxy_, proxy_);
     swap(other->version_, version_);
   }
 
   void Bind(AssociatedInterfacePtrInfo<Interface> info,
@@ skipping 72 matching lines @@
 
   uint32_t version_;
 
   DISALLOW_COPY_AND_ASSIGN(AssociatedInterfacePtrState);
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_ASSOCIATED_INTERFACE_PTR_STATE_H_