Mus+Ash: Replace (Server)WindowSurface with (Server)WindowCompositorFrameSink

services/ui/public/cpp/tests/test_window_tree.cc

Index: services/ui/public/cpp/tests/test_window_tree.cc
diff --git a/services/ui/public/cpp/tests/test_window_tree.cc b/services/ui/public/cpp/tests/test_window_tree.cc
index 8267f683158e5a7dbc340117ce27d8e26555dcb9..f344aec9d1207846a2093e3d0250f5198b24cd19 100644
--- a/services/ui/public/cpp/tests/test_window_tree.cc
+++ b/services/ui/public/cpp/tests/test_window_tree.cc
@@ -83,9 +83,9 @@ void TestWindowTree::SetWindowOpacity(uint32_t change_id,
   change_id_ = change_id;
 }
 
-void TestWindowTree::AttachSurface(
+void TestWindowTree::AttachCompositorFrameSink(
     uint32_t window_id,
-    mojom::SurfaceType type,
+    mojom::CompositorFrameSinkType type,
     mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSink> surface,
     cc::mojom::MojoCompositorFrameSinkClientPtr client) {}