Mus+Ash: Towards Unifying CompositorFrameSink terminology

services/ui/public/cpp/window_tree_client.h

Index: services/ui/public/cpp/window_tree_client.h
diff --git a/services/ui/public/cpp/window_tree_client.h b/services/ui/public/cpp/window_tree_client.h
index bac7249cac6ab51f4ba3ccb37592e180cf382dae..656691a4a3236cf659522935a81a6f33c6e7bc0b 100644
--- a/services/ui/public/cpp/window_tree_client.h
+++ b/services/ui/public/cpp/window_tree_client.h
@@ -128,10 +128,11 @@ class WindowTreeClient : public mojom::WindowTreeClient,
 
   void RequestClose(Window* window);
 
-  void AttachSurface(Id window_id,
-                     mojom::SurfaceType type,
-                     mojo::InterfaceRequest<mojom::Surface> surface,
-                     mojom::SurfaceClientPtr client);
+  void AttachSurface(
+      Id window_id,
+      mojom::SurfaceType type,
+      mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSink> surface,
+      cc::mojom::MojoCompositorFrameSinkClientPtr client);
 
   void OnWindowSurfaceDetached(Id window_id,
                                const cc::SurfaceSequence& sequence);