Mus+Ash: Unify CompositorFrameSinks

services/ui/ws/window_tree.cc

Index: services/ui/ws/window_tree.cc
diff --git a/services/ui/ws/window_tree.cc b/services/ui/ws/window_tree.cc
index 1003928bf8b306b513d7c08a45ceda6d515e4770..5dbc6f330706a1adcc6b8a5b76c3e92d98829e7d 100644
--- a/services/ui/ws/window_tree.cc
+++ b/services/ui/ws/window_tree.cc
@@ -1354,7 +1354,7 @@ void WindowTree::SetWindowOpacity(uint32_t change_id,
 void WindowTree::AttachCompositorFrameSink(
     Id transport_window_id,
     mojom::CompositorFrameSinkType type,
-    mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSink> surface,
+    cc::mojom::MojoCompositorFrameSinkRequest compositor_frame_sink,
     cc::mojom::MojoCompositorFrameSinkClientPtr client) {
   ServerWindow* window =
       GetWindowByClientId(ClientWindowId(transport_window_id));
@@ -1364,7 +1364,8 @@ void WindowTree::AttachCompositorFrameSink(
     DVLOG(1) << "request to AttachCompositorFrameSink failed";
     return;
   }
-  window->CreateCompositorFrameSink(type, std::move(surface),
+  window->CreateCompositorFrameSink(type, gfx::kNullAcceleratedWidget, nullptr,
+                                    nullptr, std::move(compositor_frame_sink),
                                     std::move(client));
 }