Mus+Ash: Unify CompositorFrameSinks

services/ui/ws/server_window_compositor_frame_sink_manager.cc

Index: services/ui/ws/server_window_compositor_frame_sink_manager.cc
diff --git a/services/ui/ws/server_window_compositor_frame_sink_manager.cc b/services/ui/ws/server_window_compositor_frame_sink_manager.cc
index 61c6ea982ce39111acff306b739485b250ceaab3..416f666fc431ec5c376ca9de0ef83e6a4eb3d193 100644
--- a/services/ui/ws/server_window_compositor_frame_sink_manager.cc
+++ b/services/ui/ws/server_window_compositor_frame_sink_manager.cc
@@ -40,16 +40,22 @@ bool ServerWindowCompositorFrameSinkManager::ShouldDraw() {
 
 void ServerWindowCompositorFrameSinkManager::CreateCompositorFrameSink(
     mojom::CompositorFrameSinkType compositor_frame_sink_type,
-    mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSink> request,
+    gfx::AcceleratedWidget widget,
+    gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
+    scoped_refptr<SurfacesContextProvider> context_provider,
+    cc::mojom::MojoCompositorFrameSinkRequest request,
     cc::mojom::MojoCompositorFrameSinkClientPtr client) {
   cc::FrameSinkId frame_sink_id(
       WindowIdToTransportId(window_->id()),
       static_cast<uint32_t>(compositor_frame_sink_type));
   CompositorFrameSinkData& data =
       type_to_compositor_frame_sink_map_[compositor_frame_sink_type];
+  // TODO(fsamuel): Create the CompositorFrameSink through the DisplayCompositor
+  // mojo interface and hold on to a MojoCompositorFrameSinkPtr.
   data.compositor_frame_sink =
       base::MakeUnique<ServerWindowCompositorFrameSink>(
-          this, frame_sink_id, std::move(request), std::move(client));
+          this, frame_sink_id, widget, gpu_memory_buffer_manager,
+          std::move(context_provider), std::move(request), std::move(client));
   data.surface_sequence_generator.set_frame_sink_id(frame_sink_id);
 }