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

services/ui/ws/window_tree_client_unittest.cc

Index: services/ui/ws/window_tree_client_unittest.cc
diff --git a/services/ui/ws/window_tree_client_unittest.cc b/services/ui/ws/window_tree_client_unittest.cc
index bfbcb066f4f6885130be5d18e8d6a05c1b23fda0..ffcae3b4274e8191a097c0cf216911984ab8a9c9 100644
--- a/services/ui/ws/window_tree_client_unittest.cc
+++ b/services/ui/ws/window_tree_client_unittest.cc
@@ -2153,9 +2153,9 @@ TEST_F(WindowTreeClientTest, SurfaceIdPropagation) {
   cc::mojom::MojoCompositorFrameSinkClientRequest client_request;
   cc::mojom::MojoCompositorFrameSinkClientPtr surface_client_ptr;
   client_request = mojo::GetProxy(&surface_client_ptr);
-  wt2()->AttachSurface(window_2_101, mojom::SurfaceType::DEFAULT,
-                       mojo::GetProxy(&surface_ptr),
-                       std::move(surface_client_ptr));
+  wt2()->AttachCompositorFrameSink(
+      window_2_101, mojom::CompositorFrameSinkType::DEFAULT,
+      mojo::GetProxy(&surface_ptr), std::move(surface_client_ptr));
   cc::CompositorFrame compositor_frame;
   compositor_frame.delegated_frame_data =
       base::MakeUnique<cc::DelegatedFrameData>();