Mus+Ash: Towards Unifying CompositorFrameSink terminology

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 2ac860a74ae9e1bb857c18f535a5a4fadcd13f97..f8ec2eb30eba392dfdc255e2dc18ac1b239b3a2b 100644
--- a/services/ui/public/cpp/tests/test_window_tree.h
+++ b/services/ui/public/cpp/tests/test_window_tree.h
@@ -59,10 +59,11 @@ class TestWindowTree : public mojom::WindowTree {
   void SetWindowOpacity(uint32_t change_id,
                         uint32_t window_id,
                         float opacity) override;
-  void AttachSurface(uint32_t window_id,
-                     mojom::SurfaceType type,
-                     mojo::InterfaceRequest<mojom::Surface> surface,
-                     mojom::SurfaceClientPtr client) override;
+  void AttachSurface(
+      uint32_t window_id,
+      mojom::SurfaceType 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;
   void RemoveWindowFromParent(uint32_t change_id, uint32_t window_id) override;
   void AddTransientWindow(uint32_t change_id,