Mus+Ash: Towards Unifying CompositorFrameSink terminology

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 a429cad7dce3c1debf522a711b7cb5a0d61973ca..a13e992901612072a94bf64e160c107bb122d2dc 100644
--- a/services/ui/ws/server_window.cc
+++ b/services/ui/ws/server_window.cc
@@ -83,9 +83,10 @@ bool ServerWindow::HasObserver(ServerWindowObserver* observer) {
   return observers_.HasObserver(observer);
 }
 
-void ServerWindow::CreateSurface(mojom::SurfaceType surface_type,
-                                 mojo::InterfaceRequest<mojom::Surface> request,
-                                 mojom::SurfaceClientPtr client) {
+void ServerWindow::CreateSurface(
+    mojom::SurfaceType surface_type,
+    mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSink> request,
+    cc::mojom::MojoCompositorFrameSinkClientPtr client) {
   GetOrCreateSurfaceManager()->CreateSurface(surface_type, std::move(request),
                                              std::move(client));
 }