mojo::Callback -> base::Callback

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 <utility>
 
+#include "base/bind.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/callback.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"
@@ skipping 30 matching lines @@
     DCHECK(!router_);
     internal::FilterChain filters;
     filters.Append<internal::MessageHeaderValidator>(Interface::Name_);
     filters.Append<typename Interface::RequestValidator_>();
 
     router_ =
         new internal::Router(std::move(handle), std::move(filters),
                              Interface::HasSyncMethods_, std::move(runner));
     router_->set_incoming_receiver(&stub_);
     router_->set_connection_error_handler(
-        [this]() { connection_error_handler_.Run(); });
+        base::Bind(&BindingState::RunConnectionErrorHandler,
+                   base::Unretained(this)));
   }
 
   bool HasAssociatedInterfaces() const { return false; }
 
   void PauseIncomingMethodCallProcessing() {
     DCHECK(router_);
     router_->PauseIncomingMethodCallProcessing();
   }
   void ResumeIncomingMethodCallProcessing() {
     DCHECK(router_);
@@ skipping 40 matching lines @@
   void EnableTestingMode() {
     DCHECK(is_bound());
     router_->EnableTestingMode();
   }
 
  private:
   void DestroyRouter() {
     router_->set_connection_error_handler(Closure());
     delete router_;
     router_ = nullptr;
-    connection_error_handler_.reset();
+    connection_error_handler_.Reset();
+  }
+
+  void RunConnectionErrorHandler() {
+    if (!connection_error_handler_.is_null())
+      connection_error_handler_.Run();
   }
 
   internal::Router* router_ = nullptr;
   typename Interface::Stub_ stub_;
   Interface* impl_;
   Closure connection_error_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(BindingState);
 };
 
@@ skipping 15 matching lines @@
     router_ = new internal::MultiplexRouter(false, std::move(handle), runner);
     router_->SetMasterInterfaceName(Interface::Name_);
     stub_.serialization_context()->router = router_;
 
     endpoint_client_.reset(new internal::InterfaceEndpointClient(
         router_->CreateLocalEndpointHandle(internal::kMasterInterfaceId),
         &stub_, base::WrapUnique(new typename Interface::RequestValidator_()),
         Interface::HasSyncMethods_, std::move(runner)));
 
     endpoint_client_->set_connection_error_handler(
-        [this]() { connection_error_handler_.Run(); });
+        base::Bind(&BindingState::RunConnectionErrorHandler,
+                   base::Unretained(this)));
   }
 
   bool HasAssociatedInterfaces() const {
     return router_ ? router_->HasAssociatedEndpoints() : false;
   }
 
   void PauseIncomingMethodCallProcessing() {
     DCHECK(router_);
     router_->PauseIncomingMethodCallProcessing();
   }
   void ResumeIncomingMethodCallProcessing() {
     DCHECK(router_);
     router_->ResumeIncomingMethodCallProcessing();
   }
 
   bool WaitForIncomingMethodCall(
       MojoDeadline deadline = MOJO_DEADLINE_INDEFINITE) {
     DCHECK(router_);
     return router_->WaitForIncomingMessage(deadline);
   }
 
   void Close() {
     if (!router_)
       return;
 
     endpoint_client_.reset();
     router_->CloseMessagePipe();
     router_ = nullptr;
-    connection_error_handler_.reset();
+    connection_error_handler_.Reset();
   }
 
   InterfaceRequest<Interface> Unbind() {
     endpoint_client_.reset();
     InterfaceRequest<Interface> request =
         MakeRequest<Interface>(router_->PassMessagePipe());
     router_ = nullptr;
-    connection_error_handler_.reset();
+    connection_error_handler_.Reset();
     return request;
   }
 
   void set_connection_error_handler(const Closure& error_handler) {
     DCHECK(is_bound());
     connection_error_handler_ = error_handler;
   }
 
   Interface* impl() { return impl_; }
 
   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 EnableTestingMode() {
     DCHECK(is_bound());
     router_->EnableTestingMode();
   }
 
  private:
+  void RunConnectionErrorHandler() {
+    if (!connection_error_handler_.is_null())
+      connection_error_handler_.Run();
+  }
+
   scoped_refptr<internal::MultiplexRouter> router_;
   std::unique_ptr<internal::InterfaceEndpointClient> endpoint_client_;
 
   typename Interface::Stub_ stub_;
   Interface* impl_;
   Closure connection_error_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(BindingState);
 };
 
 }  // namesapce internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDING_STATE_H_