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

services/ui/public/interfaces/window_tree_constants.mojom

Index: services/ui/public/interfaces/window_tree_constants.mojom
diff --git a/services/ui/public/interfaces/window_tree_constants.mojom b/services/ui/public/interfaces/window_tree_constants.mojom
index ff29b6aa4dcbf4014a92b0f55d1270f6ff60374a..924b6da2b73169daf5693bed359234aaa34ef863 100644
--- a/services/ui/public/interfaces/window_tree_constants.mojom
+++ b/services/ui/public/interfaces/window_tree_constants.mojom
@@ -30,7 +30,9 @@ struct WindowData {
 // is used. The |UNDERLAY| surface is useful if the owner of a window wants to
 // to Embed() another client and at the same time draw something under the
 // embedded apps representation.
-enum SurfaceType {
+// TODO(fsamuel): Remove this once window decorations are no longer underlay
+// surfaces. http://crbug.com/647852.
+enum CompositorFrameSinkType {
   // Only the owner of a window may obtain this surface.
   // The window manager can change the offset of this by way of
   // SetUnderlaySurfaceOffsetAndExtendedHitArea().