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

services/ui/ws/window_manager_access_policy.h

Index: services/ui/ws/window_manager_access_policy.h
diff --git a/services/ui/ws/window_manager_access_policy.h b/services/ui/ws/window_manager_access_policy.h
index 2be10ddf41aa84c1d37065caa136900f3ff39ea9..dd115c3723cf6398d1d70e3a2fe6e1ad86315b1e 100644
--- a/services/ui/ws/window_manager_access_policy.h
+++ b/services/ui/ws/window_manager_access_policy.h
@@ -41,8 +41,10 @@ class WindowManagerAccessPolicy : public AccessPolicy {
   bool CanEmbed(const ServerWindow* window) const override;
   bool CanChangeWindowVisibility(const ServerWindow* window) const override;
   bool CanChangeWindowOpacity(const ServerWindow* window) const override;
-  bool CanSetWindowSurface(const ServerWindow* window,
-                           ui::mojom::SurfaceType surface_type) const override;
+  bool CanSetWindowCompositorFrameSink(
+      const ServerWindow* window,
+      ui::mojom::CompositorFrameSinkType compositor_frame_sink_type)
+      const override;
   bool CanSetWindowBounds(const ServerWindow* window) const override;
   bool CanSetWindowProperties(const ServerWindow* window) const override;
   bool CanSetWindowTextInputState(const ServerWindow* window) const override;