Remove dependency on SurfaceManager in FrameGenerator

services/ui/ws/frame_generator.h

Index: services/ui/ws/frame_generator.h
diff --git a/services/ui/ws/frame_generator.h b/services/ui/ws/frame_generator.h
index 276e763f7c19581f970df68c850bc1e71903779f..6479e92a1f1b32ab3792ff46db4fde953a088f4f 100644
--- a/services/ui/ws/frame_generator.h
+++ b/services/ui/ws/frame_generator.h
@@ -51,9 +51,7 @@ class ServerWindowCompositorFrameSink;
 class FrameGenerator : public ServerWindowTracker,
                        public cc::mojom::MojoCompositorFrameSinkClient {
  public:
-  FrameGenerator(FrameGeneratorDelegate* delegate,
-                 ServerWindow* root_window,
-                 scoped_refptr<DisplayCompositor> display_compositor);
+  FrameGenerator(FrameGeneratorDelegate* delegate, ServerWindow* root_window);
   ~FrameGenerator() override;
 
   void OnGpuChannelEstablished(scoped_refptr<gpu::GpuChannelHost> gpu_channel);
@@ -110,11 +108,12 @@ class FrameGenerator : public ServerWindowTracker,
   // management.
   void ReleaseAllSurfaceReferences();
 
+  ui::DisplayCompositor* GetDisplayCompositor();
+
   // ServerWindowObserver implementation.
   void OnWindowDestroying(ServerWindow* window) override;
 
   FrameGeneratorDelegate* delegate_;
-  scoped_refptr<DisplayCompositor> display_compositor_;
   cc::FrameSinkId frame_sink_id_;
   ServerWindow* const root_window_;
   cc::SurfaceSequenceGenerator surface_sequence_generator_;