Mus+Ash: Towards Unifying CompositorFrameSink terminology

services/ui/ws/server_window_surface_manager.cc

Index: services/ui/ws/server_window_surface_manager.cc
diff --git a/services/ui/ws/server_window_surface_manager.cc b/services/ui/ws/server_window_surface_manager.cc
index 41bc9490bda38db0bac0955adbf8bafb84d78d4b..be11e5e86771cb43e2a8c4e8528fd726c8d8793c 100644
--- a/services/ui/ws/server_window_surface_manager.cc
+++ b/services/ui/ws/server_window_surface_manager.cc
@@ -38,8 +38,8 @@ bool ServerWindowSurfaceManager::ShouldDraw() {
 
 void ServerWindowSurfaceManager::CreateSurface(
     mojom::SurfaceType surface_type,
-    mojo::InterfaceRequest<mojom::Surface> request,
-    mojom::SurfaceClientPtr client) {
+    mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSink> request,
+    cc::mojom::MojoCompositorFrameSinkClientPtr client) {
   cc::FrameSinkId frame_sink_id(WindowIdToTransportId(window_->id()),
                                 static_cast<uint32_t>(surface_type));
   std::unique_ptr<ServerWindowSurface> surface(new ServerWindowSurface(