Mus+Ash: Towards Unifying CompositorFrameSink terminology

services/ui/public/cpp/window.h

Index: services/ui/public/cpp/window.h
diff --git a/services/ui/public/cpp/window.h b/services/ui/public/cpp/window.h
index b67af74ff416c7a53cfcbdbbcd1bdd2603873ecd..433e619e82bffe67cae1943c387b85761666a44b 100644
--- a/services/ui/public/cpp/window.h
+++ b/services/ui/public/cpp/window.h
@@ -14,6 +14,7 @@
 #include "mojo/public/cpp/bindings/array.h"
 #include "services/service_manager/public/interfaces/interface_provider.mojom.h"
 #include "services/ui/common/types.h"
+#include "services/ui/public/cpp/compositor_frame_sink.h"
 #include "services/ui/public/cpp/surface_id_handler.h"
 #include "services/ui/public/interfaces/mus_constants.mojom.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
@@ -114,10 +115,13 @@ class Window {
   // Window is attached to the root.
   bool IsDrawn() const;
 
-  std::unique_ptr<WindowSurface> RequestSurface(mojom::SurfaceType type);
+  std::unique_ptr<CompositorFrameSink> RequestCompositorFrameSink(
+      mojom::SurfaceType type,
+      scoped_refptr<cc::ContextProvider> context_provider);
 
-  void AttachSurface(mojom::SurfaceType type,
-                     std::unique_ptr<WindowSurfaceBinding> surface_binding);
+  void AttachCompositorFrameSink(
+      mojom::SurfaceType type,
+      std::unique_ptr<WindowSurfaceBinding> surface_binding);
 
   // The template-ized versions of the following methods rely on the presence
   // of a mojo::TypeConverter<const std::vector<uint8_t>, T>.