Mus+Ash: Towards Unifying CompositorFrameSink terminology

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 9a99c46247d728c2c067b90a236bd52b880dd6f4..c755e3b56e15b88936b8edceecda528368613892 100644
--- a/services/ui/ws/window_tree.cc
+++ b/services/ui/ws/window_tree.cc
@@ -1345,10 +1345,11 @@ void WindowTree::SetWindowOpacity(uint32_t change_id,
       change_id, SetWindowOpacity(ClientWindowId(window_id), opacity));
 }
 
-void WindowTree::AttachSurface(Id transport_window_id,
-                               mojom::SurfaceType type,
-                               mojo::InterfaceRequest<mojom::Surface> surface,
-                               mojom::SurfaceClientPtr client) {
+void WindowTree::AttachSurface(
+    Id transport_window_id,
+    mojom::SurfaceType type,
+    mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSink> surface,
+    cc::mojom::MojoCompositorFrameSinkClientPtr client) {
   ServerWindow* window =
       GetWindowByClientId(ClientWindowId(transport_window_id));
   const bool success =