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

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 56128da93e6e5dc3a69b3e7122362afb05e69244..232bb82afe12978eb586ac07ddaeb2bbf19e1b05 100644
--- a/services/ui/public/interfaces/window_tree.mojom
+++ b/services/ui/public/interfaces/window_tree.mojom
@@ -137,12 +137,12 @@ interface WindowTree {
   // Sets the opacity of the specified window to |opacity|.
   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,
-                cc.mojom.MojoCompositorFrameSink& surface,
-                cc.mojom.MojoCompositorFrameSinkClient client);
+  // Attaches a CompositorFrameSink to a particular window.
+  AttachCompositorFrameSink(
+      uint32 window_id,
+      CompositorFrameSinkType type,
+      cc.mojom.MojoCompositorFrameSink& compositor_frame_sink,
+      cc.mojom.MojoCompositorFrameSinkClient client);
 
   // Returns surface reference back to window server for reclamation.
   OnWindowSurfaceDetached(uint32 window_id, cc.mojom.SurfaceSequence sequence);