mojo::Callback -> base::Callback

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 <utility>
 
+#include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/callback.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"
@@ skipping 45 matching lines @@
   StrongBinding(Interface* impl, InterfaceRequest<Interface> request)
       : StrongBinding(impl) {
     Bind(std::move(request));
   }
 
   ~StrongBinding() {}
 
   void Bind(ScopedMessagePipeHandle handle) {
     DCHECK(!binding_.is_bound());
     binding_.Bind(std::move(handle));
-    binding_.set_connection_error_handler([this]() { OnConnectionError(); });
+    binding_.set_connection_error_handler(
+        base::Bind(&StrongBinding::OnConnectionError, base::Unretained(this)));
   }
 
   void Bind(InterfacePtr<Interface>* ptr) {
     DCHECK(!binding_.is_bound());
     binding_.Bind(ptr);
-    binding_.set_connection_error_handler([this]() { OnConnectionError(); });
+    binding_.set_connection_error_handler(
+        base::Bind(&StrongBinding::OnConnectionError, base::Unretained(this)));
   }
 
   void Bind(InterfaceRequest<Interface> request) {
     DCHECK(!binding_.is_bound());
     binding_.Bind(std::move(request));
-    binding_.set_connection_error_handler([this]() { OnConnectionError(); });
+    binding_.set_connection_error_handler(
+        base::Bind(&StrongBinding::OnConnectionError, base::Unretained(this)));
   }
 
   bool WaitForIncomingMethodCall() {
     return binding_.WaitForIncomingMethodCall();
   }
 
   // Note: The error handler must not delete the interface implementation.
   //
   // This method may only be called after this StrongBinding has been bound to a
   // message pipe.
   void set_connection_error_handler(const Closure& error_handler) {
     DCHECK(binding_.is_bound());
     connection_error_handler_ = error_handler;
   }
 
   Interface* impl() { return binding_.impl(); }
   // Exposed for testing, should not generally be used.
   internal::Router* internal_router() { return binding_.internal_router(); }
 
   void OnConnectionError() {
-    connection_error_handler_.Run();
+    RunConnectionErrorHandler();

[yzshen1, 2016/06/18 00:01:18]

nit: maybe no need to have such a helper because this method is the only user.

[Ken Rockot(use gerrit already), 2016/06/18 03:24:26]

Oops, done.

     delete binding_.impl();
   }
 
  private:
+  void RunConnectionErrorHandler() {
+    if (!connection_error_handler_.is_null())
+      connection_error_handler_.Run();
+  }
+
   Closure connection_error_handler_;
   Binding<Interface> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(StrongBinding);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_STRONG_BINDING_H_