exo::CompositorFrameSinkHolder's release callbacks hold ref

components/exo/compositor_frame_sink_holder.cc

Index: components/exo/compositor_frame_sink_holder.cc
diff --git a/components/exo/compositor_frame_sink_holder.cc b/components/exo/compositor_frame_sink_holder.cc
index dcd3110ab6ea9cb7a03a31a22d1e5b44cb906787..9b03687d37b72316afc0f64acbcbff8ef60319f2 100644
--- a/components/exo/compositor_frame_sink_holder.cc
+++ b/components/exo/compositor_frame_sink_holder.cc
@@ -4,7 +4,6 @@
 
 #include "components/exo/compositor_frame_sink_holder.h"
 
-#include "base/memory/ptr_util.h"
 #include "cc/resources/returned_resource.h"
 #include "components/exo/surface.h"
 
@@ -30,10 +29,12 @@ bool CompositorFrameSinkHolder::HasReleaseCallbackForResource(
   return release_callbacks_.find(id) != release_callbacks_.end();
 }
 
-void CompositorFrameSinkHolder::AddResourceReleaseCallback(
+void CompositorFrameSinkHolder::SetResourceReleaseCallback(
     cc::ResourceId id,
-    std::unique_ptr<cc::SingleReleaseCallback> callback) {
-  release_callbacks_[id] = std::make_pair(this, std::move(callback));
+    std::unique_ptr<cc::ReleaseCallback> callback) {
+  printf("CompositorFrameSinkHolder::SetResourceReleaseCallback()\n");
+  DCHECK(callback);
+  release_callbacks_[id] = std::move(callback);
 }
 
 void CompositorFrameSinkHolder::ActivateFrameCallbacks(
@@ -81,13 +82,16 @@ void CompositorFrameSinkHolder::OnBeginFrame(const cc::BeginFrameArgs& args) {
 
 void CompositorFrameSinkHolder::ReclaimResources(
     const cc::ReturnedResourceArray& resources) {
+  printf("CompositorFrameSinkHolder::ReclaimResources()\n");
   for (auto& resource : resources) {
     auto it = release_callbacks_.find(resource.id);
     DCHECK(it != release_callbacks_.end());
-    std::unique_ptr<cc::SingleReleaseCallback> callback =
-        std::move(it->second.second);
+    printf("it != release_callbacks_.end()\n");
+    DCHECK(it->second);
+    printf("Running\n");
+    it->second->Run(resource.sync_token, resource.lost);
+    printf("it->second->Run().\n");
     release_callbacks_.erase(it);
-    callback->Run(resource.sync_token, resource.lost);
   }
 }