Getting rid of CompositorFrameMetadata::satisfies_sequences

ui/android/delegated_frame_host_android.cc

Index: ui/android/delegated_frame_host_android.cc
diff --git a/ui/android/delegated_frame_host_android.cc b/ui/android/delegated_frame_host_android.cc
index f9f6e448cb34a7e4144f9cb698aaa667db100b39..a99b9c7b43bf95b01aeee95b28f9224cc2c749dd 100644
--- a/ui/android/delegated_frame_host_android.cc
+++ b/ui/android/delegated_frame_host_android.cc
@@ -25,16 +25,19 @@ namespace ui {
 
 namespace {
 
-void SatisfyCallback(cc::SurfaceManager* manager,
+void SatisfyCallback(base::WeakPtr<cc::SurfaceManager> manager,
                      const cc::SurfaceSequence& sequence) {
+  if (!manager)
+    return;
   std::vector<uint32_t> sequences;
   sequences.push_back(sequence.sequence);
   manager->DidSatisfySequences(sequence.frame_sink_id, &sequences);
 }
 
-void RequireCallback(cc::SurfaceManager* manager,
+void RequireCallback(base::WeakPtr<cc::SurfaceManager> manager,
                      const cc::SurfaceId& id,
                      const cc::SurfaceSequence& sequence) {
+  DCHECK(manager);
   cc::Surface* surface = manager->GetSurfaceForId(id);
   if (!surface) {
     LOG(ERROR) << "Attempting to require callback on nonexistent surface";
@@ -50,8 +53,8 @@ scoped_refptr<cc::SurfaceLayer> CreateSurfaceLayer(
     bool surface_opaque) {
   // manager must outlive compositors using it.
   scoped_refptr<cc::SurfaceLayer> layer = cc::SurfaceLayer::Create(
-      base::Bind(&SatisfyCallback, base::Unretained(surface_manager)),
-      base::Bind(&RequireCallback, base::Unretained(surface_manager)));
+      base::Bind(&SatisfyCallback, surface_manager->GetWeakPtr()),
+      base::Bind(&RequireCallback, surface_manager->GetWeakPtr()));
   layer->SetSurfaceId(surface_id, 1.f, surface_size);
   layer->SetBounds(surface_size);
   layer->SetIsDrawable(true);