Mus+Ash: Towards Unifying CompositorFrameSink terminology

services/ui/public/interfaces/window_tree.mojom

Index: services/ui/public/interfaces/window_tree.mojom
diff --git a/services/ui/public/interfaces/window_tree.mojom b/services/ui/public/interfaces/window_tree.mojom
index fb8f8b1d08e52c5bc8d4d61362929c4c80ef3d23..56128da93e6e5dc3a69b3e7122362afb05e69244 100644
--- a/services/ui/public/interfaces/window_tree.mojom
+++ b/services/ui/public/interfaces/window_tree.mojom
@@ -6,10 +6,10 @@ module ui.mojom;
 
 import "cc/ipc/surface_id.mojom";
 import "cc/ipc/surface_sequence.mojom";
+import "cc/ipc/mojo_compositor_frame_sink.mojom";
 import "services/ui/public/interfaces/cursor.mojom";
 import "services/ui/public/interfaces/event_matcher.mojom";
 import "services/ui/public/interfaces/mus_constants.mojom";
-import "services/ui/public/interfaces/surface.mojom";
 import "services/ui/public/interfaces/window_manager.mojom";
 import "services/ui/public/interfaces/window_manager_constants.mojom";
 import "services/ui/public/interfaces/window_tree_constants.mojom";
@@ -138,10 +138,11 @@ interface WindowTree {
   SetWindowOpacity(uint32 change_id, uint32 window_id, float opacity);
 
   // Attaches a Surface to a particular window.
+  // TODO(fsamuel): Rename this CompositorFrameSink
   AttachSurface(uint32 window_id,
                 SurfaceType type,
-                Surface& surface,
-                SurfaceClient client);
+                cc.mojom.MojoCompositorFrameSink& surface,
+                cc.mojom.MojoCompositorFrameSinkClient client);
 
   // Returns surface reference back to window server for reclamation.
   OnWindowSurfaceDetached(uint32 window_id, cc.mojom.SurfaceSequence sequence);