DirectCompositorFrameSink Uses CompositorFrameSinkSupport

cc/surfaces/compositor_frame_sink_support.h

Index: cc/surfaces/compositor_frame_sink_support.h
diff --git a/cc/surfaces/compositor_frame_sink_support.h b/cc/surfaces/compositor_frame_sink_support.h
index f0e19694704260d10b1a1d79a46b9bcf5e2ffa41..bc312fb0f112dfb1e2de26dc486f4821da12d924 100644
--- a/cc/surfaces/compositor_frame_sink_support.h
+++ b/cc/surfaces/compositor_frame_sink_support.h
@@ -30,7 +30,7 @@ class CC_SURFACES_EXPORT CompositorFrameSinkSupport
       CompositorFrameSinkSupportClient* client,
       SurfaceManager* surface_manager,
       const FrameSinkId& frame_sink_id,
-      std::unique_ptr<Display> display,
+      Display* display,
       std::unique_ptr<BeginFrameSource> display_begin_frame_source);
 
   ~CompositorFrameSinkSupport() override;
@@ -46,8 +46,10 @@ class CC_SURFACES_EXPORT CompositorFrameSinkSupport
   void Satisfy(const SurfaceSequence& sequence);
   void AddChildFrameSink(const FrameSinkId& child_frame_sink_id);
   void RemoveChildFrameSink(const FrameSinkId& child_frame_sink_id);
+  void SetNeedsSyncPoints(bool needs_sync_points);
+  void ForceReclaimResources();
 
-  Display* display() { return display_.get(); }
+  Display* display() { return display_; }
 
  private:
   void DidReceiveCompositorFrameAck();
@@ -81,7 +83,7 @@ class CC_SURFACES_EXPORT CompositorFrameSinkSupport
   // created with non-null gpu::SurfaceHandle. In the window server, the display
   // root window's CompositorFrameSink will have a valid gpu::SurfaceHandle.
   std::unique_ptr<BeginFrameSource> display_begin_frame_source_;
-  std::unique_ptr<Display> display_;
+  Display* display_;
 
   LocalFrameId local_frame_id_;
   SurfaceFactory surface_factory_;