C++ bindings: support using a callback as connection error handler.

mojo/public/cpp/bindings/strong_binding.h

 // Copyright 2014 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_STRONG_BINDING_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_STRONG_BINDING_H_
 
 #include <assert.h>
 
 #include "mojo/public/c/environment/async_waiter.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/public/cpp/bindings/error_handler.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/lib/filter_chain.h"
 #include "mojo/public/cpp/bindings/lib/message_header_validator.h"
 #include "mojo/public/cpp/bindings/lib/router.h"
 #include "mojo/public/cpp/system/core.h"
 
 namespace mojo {
 
@@ skipping 15 matching lines @@
 //   };
 //
 //   class MyFooFactory : public InterfaceFactory<Foo> {
 //    public:
 //     void Create(..., InterfaceRequest<Foo> request) override {
 //       new StronglyBound(request.Pass());  // The binding now owns the
 //                                           // instance of StronglyBound.
 //     }
 //   };
 template <typename Interface>
-class StrongBinding : public ErrorHandler {
+class StrongBinding {
   MOJO_MOVE_ONLY_TYPE(StrongBinding)
 
  public:
   explicit StrongBinding(Interface* impl) : binding_(impl) {
-    binding_.set_error_handler(this);
+    binding_.set_connection_error_handler([this]() { OnConnectionError(); });
   }
 
   StrongBinding(
       Interface* impl,
       ScopedMessagePipeHandle handle,
       const MojoAsyncWaiter* waiter = Environment::GetDefaultAsyncWaiter())
       : StrongBinding(impl) {
     binding_.Bind(handle.Pass(), waiter);
   }
 
   StrongBinding(
       Interface* impl,
       InterfacePtr<Interface>* ptr,
       const MojoAsyncWaiter* waiter = Environment::GetDefaultAsyncWaiter())
       : StrongBinding(impl) {
     binding_.Bind(ptr, waiter);
   }
 
   StrongBinding(
       Interface* impl,
       InterfaceRequest<Interface> request,
       const MojoAsyncWaiter* waiter = Environment::GetDefaultAsyncWaiter())
       : StrongBinding(impl) {
     binding_.Bind(request.Pass(), waiter);
   }
 
-  ~StrongBinding() override {}
+  ~StrongBinding() {}
 
   void Bind(
       ScopedMessagePipeHandle handle,
       const MojoAsyncWaiter* waiter = Environment::GetDefaultAsyncWaiter()) {
     assert(!binding_.is_bound());
     binding_.Bind(handle.Pass(), waiter);
   }
 
   void Bind(
       InterfacePtr<Interface>* ptr,
       const MojoAsyncWaiter* waiter = Environment::GetDefaultAsyncWaiter()) {
     assert(!binding_.is_bound());
     binding_.Bind(ptr, waiter);
   }
 
   void Bind(
       InterfaceRequest<Interface> request,
       const MojoAsyncWaiter* waiter = Environment::GetDefaultAsyncWaiter()) {
     assert(!binding_.is_bound());
     binding_.Bind(request.Pass(), waiter);
   }
 
   bool WaitForIncomingMethodCall() {
     return binding_.WaitForIncomingMethodCall();
   }
 
+  void set_connection_error_handler(const Closure& error_handler) {
+    connection_error_handler_ = error_handler;
+  }
+
+  // NOTE: Deprecated. Please use the method above.
+  // TODO(yzshen): Remove this method once all callsites are converted.
   void set_error_handler(ErrorHandler* error_handler) {
-    error_handler_ = error_handler;
+    set_connection_error_handler(
+        [error_handler]() { error_handler->OnConnectionError(); });
   }
 
   Interface* impl() { return binding_.impl(); }
   // Exposed for testing, should not generally be used.
   internal::Router* internal_router() { return binding_.internal_router(); }
 
-  // ErrorHandler implementation
-  void OnConnectionError() override {
-    if (error_handler_)
-      error_handler_->OnConnectionError();
+  void OnConnectionError() {
+    connection_error_handler_.Run();
     delete binding_.impl();
   }
 
  private:
-  ErrorHandler* error_handler_ = nullptr;
+  Closure connection_error_handler_;
   Binding<Interface> binding_;
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_STRONG_BINDING_H_