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

mojo/public/cpp/bindings/associated_binding.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_ASSOCIATED_BINDING_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_BINDING_H_
 
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 109 matching lines @@
   // dispatch. If a filter returns |false| from Accept(), the message is not
   // dispatched and the pipe is closed. Filters cannot be removed.
   void AddFilter(std::unique_ptr<MessageReceiver> filter) {
     DCHECK(endpoint_client_);
     endpoint_client_->AddFilter(std::move(filter));
   }
 
   // Closes the associated interface. Puts this object into a state where it can
   // be rebound.
   void Close() {
-    DCHECK(endpoint_client_);
     endpoint_client_.reset();
   }
 
   // Similar to the method above, but also specifies a disconnect reason.
   void CloseWithReason(uint32_t custom_reason, const std::string& description) {
-    DCHECK(endpoint_client_);
-    endpoint_client_->control_message_proxy()->SendDisconnectReason(
-        custom_reason, description);
+    if (endpoint_client_)
+      endpoint_client_->CloseWithReason(custom_reason, description);
     Close();
   }
 
   // Unbinds and returns the associated interface request so it can be
   // used in another context, such as on another thread or with a different
   // implementation. Puts this object into a state where it can be rebound.
   AssociatedInterfaceRequest<Interface> Unbind() {
     DCHECK(endpoint_client_);
 
     AssociatedInterfaceRequest<Interface> request;
@@ skipping 43 matching lines @@
  private:
   std::unique_ptr<InterfaceEndpointClient> endpoint_client_;
   typename Interface::template Stub_<ImplRefTraits> stub_;
 
   DISALLOW_COPY_AND_ASSIGN(AssociatedBinding);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_BINDING_H_