Mojo C++ bindings: support disconnect with a reason.

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

 // Copyright 2016 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.
 
 #include "mojo/public/cpp/bindings/lib/binding_state.h"
 
 #include "mojo/public/cpp/bindings/lib/control_message_proxy.h"
 
 namespace mojo {
 namespace internal {
@@ skipping 22 matching lines @@
 }
 
 void SimpleBindingState::Close() {
   if (!router_)
     return;
 
   router_->CloseMessagePipe();
   DestroyRouter();
 }
 
+void SimpleBindingState::CloseWithReason(uint32_t custom_reason,
+                                         const std::string& description) {
+  if (router_)
+    router_->control_message_proxy()->SendDisconnectReason(custom_reason,
+                                                           description);
+  Close();
+}
+
 void SimpleBindingState::FlushForTesting() {
   router_->control_message_proxy()->FlushForTesting();
 }
 
 void SimpleBindingState::EnableTestingMode() {
   DCHECK(is_bound());
   router_->EnableTestingMode();
 }
 
 void SimpleBindingState::BindInternal(
     ScopedMessagePipeHandle handle,
     scoped_refptr<base::SingleThreadTaskRunner> runner,
     const char* interface_name,
     std::unique_ptr<MessageReceiver> request_validator,
     bool has_sync_methods,
     MessageReceiverWithResponderStatus* stub,
     uint32_t interface_version) {
   FilterChain filters;
   filters.Append<MessageHeaderValidator>(interface_name);
   filters.Append(std::move(request_validator));
 
   router_ = new internal::Router(std::move(handle), std::move(filters),
                                  has_sync_methods, std::move(runner),
                                  interface_version);
   router_->set_incoming_receiver(stub);
-  router_->set_connection_error_handler(base::Bind(
-      &SimpleBindingState::RunConnectionErrorHandler, base::Unretained(this)));
 }
 
 void SimpleBindingState::DestroyRouter() {
-  router_->set_connection_error_handler(base::Closure());
   delete router_;
   router_ = nullptr;
-  connection_error_handler_.Reset();
-}
-
-void SimpleBindingState::RunConnectionErrorHandler() {
-  if (!connection_error_handler_.is_null())
-    connection_error_handler_.Run();
 }
 
 // -----------------------------------------------------------------------------
 
 MultiplexedBindingState::MultiplexedBindingState() = default;
 
 MultiplexedBindingState::~MultiplexedBindingState() = default;
 
 void MultiplexedBindingState::AddFilter(
     std::unique_ptr<MessageReceiver> filter) {
@@ skipping 19 matching lines @@
   return router_->WaitForIncomingMessage(deadline);
 }
 
 void MultiplexedBindingState::Close() {
   if (!router_)
     return;
 
   endpoint_client_.reset();
   router_->CloseMessagePipe();
   router_ = nullptr;
-  connection_error_handler_.Reset();
+}
+
+void MultiplexedBindingState::CloseWithReason(uint32_t custom_reason,
+                                              const std::string& description) {
+  if (endpoint_client_)
+    endpoint_client_->control_message_proxy()->SendDisconnectReason(
+        custom_reason, description);
+  Close();
 }
 
 void MultiplexedBindingState::FlushForTesting() {
   endpoint_client_->control_message_proxy()->FlushForTesting();
 }
 
 void MultiplexedBindingState::EnableTestingMode() {
   DCHECK(is_bound());
   router_->EnableTestingMode();
 }
 
 void MultiplexedBindingState::BindInternal(
     ScopedMessagePipeHandle handle,
     scoped_refptr<base::SingleThreadTaskRunner> runner,
     const char* interface_name,
     std::unique_ptr<MessageReceiver> request_validator,
     bool has_sync_methods,
     MessageReceiverWithResponderStatus* stub,
     uint32_t interface_version) {
   DCHECK(!router_);
 
   router_ = new internal::MultiplexRouter(false, std::move(handle), runner);
   router_->SetMasterInterfaceName(interface_name);
 
   endpoint_client_.reset(new InterfaceEndpointClient(
       router_->CreateLocalEndpointHandle(kMasterInterfaceId), stub,
       std::move(request_validator), has_sync_methods, std::move(runner),
       interface_version));
-
-  endpoint_client_->set_connection_error_handler(
-      base::Bind(&MultiplexedBindingState::RunConnectionErrorHandler,
-                 base::Unretained(this)));
-}
-
-void MultiplexedBindingState::RunConnectionErrorHandler() {
-  if (!connection_error_handler_.is_null())
-    connection_error_handler_.Run();
 }
 
 }  // namesapce internal
 }  // namespace mojo