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

services/ui/ws/access_policy.h

Index: services/ui/ws/access_policy.h
diff --git a/services/ui/ws/access_policy.h b/services/ui/ws/access_policy.h
index a8e25e2a571550e12675f2ac12374e1d1ebd6560..901233963f8d8f096d2ff5dadaed0d2366c5cb8a 100644
--- a/services/ui/ws/access_policy.h
+++ b/services/ui/ws/access_policy.h
@@ -49,8 +49,9 @@ class AccessPolicy {
   virtual bool CanEmbed(const ServerWindow* window) const = 0;
   virtual bool CanChangeWindowVisibility(const ServerWindow* window) const = 0;
   virtual bool CanChangeWindowOpacity(const ServerWindow* window) const = 0;
-  virtual bool CanSetWindowSurface(const ServerWindow* window,
-                                   mojom::SurfaceType surface_type) const = 0;
+  virtual bool CanSetWindowCompositorFrameSink(
+      const ServerWindow* window,
+      mojom::CompositorFrameSinkType compositor_frame_sink_type) const = 0;
   virtual bool CanSetWindowBounds(const ServerWindow* window) const = 0;
   virtual bool CanSetWindowProperties(const ServerWindow* window) const = 0;
   virtual bool CanSetWindowTextInputState(const ServerWindow* window) const = 0;