Mus+Ash: Towards Unifying CompositorFrameSink terminology

services/ui/public/cpp/window_tree_client.cc

Index: services/ui/public/cpp/window_tree_client.cc
diff --git a/services/ui/public/cpp/window_tree_client.cc b/services/ui/public/cpp/window_tree_client.cc
index 63ccde489ad667c9835a022071a4a036661f226e..dac05b9d711e694baa450f3f93bda96cc57ab221 100644
--- a/services/ui/public/cpp/window_tree_client.cc
+++ b/services/ui/public/cpp/window_tree_client.cc
@@ -352,8 +352,8 @@ void WindowTreeClient::RequestClose(Window* window) {
 void WindowTreeClient::AttachSurface(
     Id window_id,
     mojom::SurfaceType type,
-    mojo::InterfaceRequest<mojom::Surface> surface,
-    mojom::SurfaceClientPtr client) {
+    mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSink> surface,
+    cc::mojom::MojoCompositorFrameSinkClientPtr client) {
   DCHECK(tree_);
   tree_->AttachSurface(window_id, type, std::move(surface), std::move(client));
 }