Mus+Ash: Unify CompositorFrameSinks

services/ui/ws/server_window.cc

Index: services/ui/ws/server_window.cc
diff --git a/services/ui/ws/server_window.cc b/services/ui/ws/server_window.cc
index d1952cc3a6827fdcede6dc76c488ff837c6d1fbe..f24bee147d8a3c9e2e40049d40f2cb65fdbe8ba1 100644
--- a/services/ui/ws/server_window.cc
+++ b/services/ui/ws/server_window.cc
@@ -85,10 +85,14 @@ bool ServerWindow::HasObserver(ServerWindowObserver* observer) {
 
 void ServerWindow::CreateCompositorFrameSink(
     mojom::CompositorFrameSinkType compositor_frame_sink_type,
+    gfx::AcceleratedWidget widget,
+    gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
+    scoped_refptr<SurfacesContextProvider> context_provider,
     cc::mojom::MojoCompositorFrameSinkRequest request,
     cc::mojom::MojoCompositorFrameSinkClientPtr client) {
   GetOrCreateCompositorFrameSinkManager()->CreateCompositorFrameSink(
-      compositor_frame_sink_type, std::move(request), std::move(client));
+      compositor_frame_sink_type, widget, gpu_memory_buffer_manager,
+      std::move(context_provider), std::move(request), std::move(client));
 }
 
 void ServerWindow::Add(ServerWindow* child) {