Mus+Ash: Towards Unifying CompositorFrameSink terminology

services/ui/ws/server_window.h

Index: services/ui/ws/server_window.h
diff --git a/services/ui/ws/server_window.h b/services/ui/ws/server_window.h
index d6266bb42f443391db31c950e5f3611a5599782f..a698a0c9272be829e70815c9b63fa80a3f9db226 100644
--- a/services/ui/ws/server_window.h
+++ b/services/ui/ws/server_window.h
@@ -15,7 +15,6 @@
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#include "services/ui/public/interfaces/surface.mojom.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "services/ui/ws/ids.h"
 #include "services/ui/ws/server_window_surface.h"
@@ -59,9 +58,10 @@ class ServerWindow {
   bool HasObserver(ServerWindowObserver* observer);
 
   // Creates a new surface of the specified type, replacing the existing.
-  void CreateSurface(mojom::SurfaceType surface_type,
-                     mojo::InterfaceRequest<mojom::Surface> request,
-                     mojom::SurfaceClientPtr client);
+  void CreateSurface(
+      mojom::SurfaceType surface_type,
+      mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSink> request,
+      cc::mojom::MojoCompositorFrameSinkClientPtr client);
 
   const WindowId& id() const { return id_; }