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

mojo/public/cpp/bindings/lib/binding_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_BINDING_STATE_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDING_STATE_H_
 
 #include <memory>
+#include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/single_thread_task_runner.h"
 #include "mojo/public/cpp/bindings/associated_group.h"
+#include "mojo/public/cpp/bindings/connection_error_callback.h"
 #include "mojo/public/cpp/bindings/filter_chain.h"
 #include "mojo/public/cpp/bindings/interface_endpoint_client.h"
 #include "mojo/public/cpp/bindings/interface_id.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
 #include "mojo/public/cpp/bindings/interface_ptr_info.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/lib/multiplex_router.h"
 #include "mojo/public/cpp/bindings/lib/router.h"
 #include "mojo/public/cpp/bindings/message_header_validator.h"
 #include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h"
@@ skipping 13 matching lines @@
 
   bool HasAssociatedInterfaces() const { return false; }
 
   void PauseIncomingMethodCallProcessing();
   void ResumeIncomingMethodCallProcessing();
 
   bool WaitForIncomingMethodCall(
       MojoDeadline deadline = MOJO_DEADLINE_INDEFINITE);
 
   void Close();
+  void CloseWithReason(uint32_t custom_reason, const std::string& description);
 
   void set_connection_error_handler(const base::Closure& error_handler) {
     DCHECK(is_bound());
-    connection_error_handler_ = error_handler;
+    router_->set_connection_error_handler(error_handler);
+  }
+
+  void set_connection_error_with_reason_handler(
+      const ConnectionErrorWithReasonCallback& error_handler) {
+    DCHECK(is_bound());
+    router_->set_connection_error_with_reason_handler(error_handler);
   }
 
   bool is_bound() const { return !!router_; }
 
   MessagePipeHandle handle() const {
     DCHECK(is_bound());
     return router_->handle();
   }
 
   AssociatedGroup* associated_group() { return nullptr; }
 
   void FlushForTesting();
 
   void EnableTestingMode();
 
  protected:
   void 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);
 
   void DestroyRouter();
 
   internal::Router* router_ = nullptr;
-  base::Closure connection_error_handler_;
-
- private:
-  void RunConnectionErrorHandler();
 };
 
 template <typename Interface, bool use_multiplex_router>
 class BindingState;
 
 // Uses a single-threaded, dedicated router. If |Interface| doesn't have any
 // methods to pass associated interface pointers or requests, there won't be
 // multiple interfaces running on the underlying message pipe. In that case, we
 // can use this specialization to reduce cost.
 template <typename Interface>
@@ skipping 41 matching lines @@
 
   bool HasAssociatedInterfaces() const;
 
   void PauseIncomingMethodCallProcessing();
   void ResumeIncomingMethodCallProcessing();
 
   bool WaitForIncomingMethodCall(
       MojoDeadline deadline = MOJO_DEADLINE_INDEFINITE);
 
   void Close();
+  void CloseWithReason(uint32_t custom_reason, const std::string& description);
 
   void set_connection_error_handler(const base::Closure& error_handler) {
     DCHECK(is_bound());
-    connection_error_handler_ = error_handler;
+    endpoint_client_->set_connection_error_handler(error_handler);
+  }
+
+  void set_connection_error_with_reason_handler(
+      const ConnectionErrorWithReasonCallback& error_handler) {
+    DCHECK(is_bound());
+    endpoint_client_->set_connection_error_with_reason_handler(error_handler);
   }
 
   bool is_bound() const { return !!router_; }
 
   MessagePipeHandle handle() const {
     DCHECK(is_bound());
     return router_->handle();
   }
 
   AssociatedGroup* associated_group() {
     return endpoint_client_ ? endpoint_client_->associated_group() : nullptr;
   }
 
   void FlushForTesting();
 
   void EnableTestingMode();
 
  protected:
   void 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);
 
   scoped_refptr<internal::MultiplexRouter> router_;
   std::unique_ptr<InterfaceEndpointClient> endpoint_client_;
-  base::Closure connection_error_handler_;
-
- private:
-  void RunConnectionErrorHandler();
 };
 
 // Uses a multiplexing router. If |Interface| has methods to pass associated
 // interface pointers or requests, this specialization should be used.
 template <typename Interface>
 class BindingState<Interface, true> : public MultiplexedBindingState {
  public:
   explicit BindingState(Interface* impl) : impl_(impl) {
     stub_.set_sink(impl_);
   }
 
   ~BindingState() { Close(); }
 
   void Bind(ScopedMessagePipeHandle handle,
             scoped_refptr<base::SingleThreadTaskRunner> runner) {
     MultiplexedBindingState::BindInternal(
         std::move(handle), runner, Interface::Name_,
         base::MakeUnique<typename Interface::RequestValidator_>(),
         Interface::HasSyncMethods_, &stub_, Interface::Version_);
     stub_.serialization_context()->group_controller = router_;
   }
 
   InterfaceRequest<Interface> Unbind() {
     endpoint_client_.reset();
     InterfaceRequest<Interface> request =
         MakeRequest<Interface>(router_->PassMessagePipe());
     router_ = nullptr;
-    connection_error_handler_.Reset();
     return request;
   }
 
   Interface* impl() { return impl_; }
 
  private:
   typename Interface::Stub_ stub_;
   Interface* impl_;
 
   DISALLOW_COPY_AND_ASSIGN(BindingState);
 };
 
 }  // namesapce internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDING_STATE_H_