Move display_ From CompositorFrameSinkSupport To GpuDisplayCompositorFrameSink

components/display_compositor/gpu_compositor_frame_sink.h

Index: components/display_compositor/gpu_compositor_frame_sink.h
diff --git a/components/display_compositor/gpu_compositor_frame_sink.h b/components/display_compositor/gpu_compositor_frame_sink.h
index c4a08a97cb4b49b06f9223252c2e7f562c20851a..e6d1daeedd4f8143ad15af0e50b6d50f2791d4c1 100644
--- a/components/display_compositor/gpu_compositor_frame_sink.h
+++ b/components/display_compositor/gpu_compositor_frame_sink.h
@@ -18,10 +18,6 @@
 #include "components/display_compositor/gpu_compositor_frame_sink_delegate.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
-namespace cc {
-class Display;
-}
-
 namespace display_compositor {
 
 // Server side representation of a WindowSurface.
@@ -32,9 +28,7 @@ class DISPLAY_COMPOSITOR_EXPORT GpuCompositorFrameSink
  public:
   GpuCompositorFrameSink(
       GpuCompositorFrameSinkDelegate* delegate,
-      cc::SurfaceManager* surface_manager,
-      const cc::FrameSinkId& frame_sink_id,
-      cc::Display* display,
+      std::unique_ptr<cc::CompositorFrameSinkSupport> support,
       cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request,
       cc::mojom::MojoCompositorFrameSinkClientPtr client);
 
@@ -59,8 +53,7 @@ class DISPLAY_COMPOSITOR_EXPORT GpuCompositorFrameSink
   void OnPrivateConnectionLost();
 
   GpuCompositorFrameSinkDelegate* const delegate_;
-  cc::CompositorFrameSinkSupport support_;
-  cc::SurfaceManager* const surface_manager_;
+  std::unique_ptr<cc::CompositorFrameSinkSupport> support_;
 
  private:
   // cc::CompositorFrameSinkSupportClient implementation:
@@ -69,7 +62,6 @@ class DISPLAY_COMPOSITOR_EXPORT GpuCompositorFrameSink
   void ReclaimResources(const cc::ReturnedResourceArray& resources) override;
   void WillDrawSurface() override;
 
-
   bool client_connection_lost_ = false;
   bool private_connection_lost_ = false;