FrameGenerator should receive SurfaceInfo and use it in frame generation

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 9b7e742e43daa45c2722114a5c2576d404f0b2db..1df7be09744b07112de1dc59c703465317e68f9d 100644
--- a/services/ui/ws/frame_generator.h
+++ b/services/ui/ws/frame_generator.h
@@ -23,7 +23,6 @@
 
 namespace cc {
 class RenderPass;
-class SurfaceId;
 }
 
 namespace ui {
@@ -53,7 +52,8 @@ class FrameGenerator : public ServerWindowTracker,
 
   // If |window| corresponds to the active WM for the display then update
   // |window_manager_surface_id_|.
-  void OnSurfaceCreated(const cc::SurfaceId& surface_id, ServerWindow* window);
+  void OnSurfaceCreated(const cc::SurfaceInfo& surface_info,
+                        ServerWindow* window);
 
  private:
   friend class ui::ws::test::FrameGeneratorTest;
@@ -84,7 +84,7 @@ class FrameGenerator : public ServerWindowTracker,
   cc::mojom::MojoCompositorFrameSinkPtr compositor_frame_sink_;
   cc::mojom::DisplayPrivatePtr display_private_;
 
-  cc::SurfaceId window_manager_surface_id_;
+  cc::SurfaceInfo window_manager_surface_info_;
 
   mojo::Binding<cc::mojom::MojoCompositorFrameSinkClient> binding_;