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

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

Index: services/ui/public/cpp/tests/test_window_tree.h
diff --git a/services/ui/public/cpp/tests/test_window_tree.h b/services/ui/public/cpp/tests/test_window_tree.h
index f8ec2eb30eba392dfdc255e2dc18ac1b239b3a2b..7bab30a1a3b5c6c5270725e28c1f422393f8b83e 100644
--- a/services/ui/public/cpp/tests/test_window_tree.h
+++ b/services/ui/public/cpp/tests/test_window_tree.h
@@ -59,9 +59,9 @@ class TestWindowTree : public mojom::WindowTree {
   void SetWindowOpacity(uint32_t change_id,
                         uint32_t window_id,
                         float opacity) override;
-  void AttachSurface(
+  void AttachCompositorFrameSink(
       uint32_t window_id,
-      mojom::SurfaceType type,
+      mojom::CompositorFrameSinkType type,
       mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSink> surface,
       cc::mojom::MojoCompositorFrameSinkClientPtr client) override;
   void AddWindow(uint32_t change_id, uint32_t parent, uint32_t child) override;