Replace usage of base::Callback with std::function
Test: th
Change-Id: If1083578a78d33b0d149cce312dd36fc7ba5d8ce
diff --git a/aosp/binder_service_android.cc b/aosp/binder_service_android.cc
index e7c20c5..0f4b768 100644
--- a/aosp/binder_service_android.cc
+++ b/aosp/binder_service_android.cc
@@ -77,10 +77,7 @@
auto binder_wrapper = android::BinderWrapper::Get();
binder_wrapper->RegisterForDeathNotifications(
callback_binder,
- base::Bind(
- base::IgnoreResult(&BinderUpdateEngineAndroidService::UnbindCallback),
- base::Unretained(this),
- base::Unretained(callback_binder.get())));
+ [this, callback = callback_binder.get()]() { UnbindCallback(callback); });
*return_value = true;
return Status::ok();
@@ -236,7 +233,7 @@
update_engine::UpdateStatus::CLEANUP_PREVIOUS_UPDATE),
progress));
}
- void RegisterForDeathNotifications(base::Closure unbind) {
+ void RegisterForDeathNotifications(const std::function<void()>& unbind) {
const android::sp<android::IBinder>& callback_binder =
IUpdateEngineCallback::asBinder(callback_);
auto binder_wrapper = android::BinderWrapper::Get();