Manage OffscreenCanvasCompositorFrameSink lifetime explicitly

content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_provider_impl.cc

Index: content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_provider_impl.cc
diff --git a/content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_provider_impl.cc b/content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_provider_impl.cc
index 5a83aa44d624281b9473df38e2fc48a0e1799946..abd15c636fde412a497e1a6f02de96d7170332ca 100644
--- a/content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_provider_impl.cc
+++ b/content/browser/renderer_host/offscreen_canvas_compositor_frame_sink_provider_impl.cc
@@ -17,21 +17,29 @@ OffscreenCanvasCompositorFrameSinkProviderImpl::
 OffscreenCanvasCompositorFrameSinkProviderImpl::
     ~OffscreenCanvasCompositorFrameSinkProviderImpl() {}
 
-// static
-void OffscreenCanvasCompositorFrameSinkProviderImpl::Create(
+void OffscreenCanvasCompositorFrameSinkProviderImpl::Add(
     blink::mojom::OffscreenCanvasCompositorFrameSinkProviderRequest request) {
-  mojo::MakeStrongBinding(
-      base::MakeUnique<OffscreenCanvasCompositorFrameSinkProviderImpl>(),
-      std::move(request));
+  bindings_.AddBinding(this, std::move(request));
 }
 
 void OffscreenCanvasCompositorFrameSinkProviderImpl::CreateCompositorFrameSink(
     const cc::FrameSinkId& frame_sink_id,
     cc::mojom::MojoCompositorFrameSinkClientPtr client,
     cc::mojom::MojoCompositorFrameSinkRequest request) {
-  OffscreenCanvasCompositorFrameSink::Create(frame_sink_id, GetSurfaceManager(),
-                                             std::move(client),
-                                             std::move(request));
+  compositor_frame_sinks_[frame_sink_id] =
+      base::MakeUnique<OffscreenCanvasCompositorFrameSink>(
+          this, frame_sink_id, std::move(request), std::move(client));
+}
+
+cc::SurfaceManager*
+OffscreenCanvasCompositorFrameSinkProviderImpl::GetSurfaceManager() {
+  return content::GetSurfaceManager();
+}
+
+void OffscreenCanvasCompositorFrameSinkProviderImpl::
+    OnCompositorFrameSinkClientConnectionLost(
+        const cc::FrameSinkId& frame_sink_id) {
+  compositor_frame_sinks_.erase(frame_sink_id);
 }
 
 }  // namespace content