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

services/ui/ws/default_access_policy.cc

Index: services/ui/ws/default_access_policy.cc
diff --git a/services/ui/ws/default_access_policy.cc b/services/ui/ws/default_access_policy.cc
index ff6367ef7da6bbb1162fb3d1e11544815d392db9..42fc49716ffbeb7a326dfd042c3f42b7722527b4 100644
--- a/services/ui/ws/default_access_policy.cc
+++ b/services/ui/ws/default_access_policy.cc
@@ -99,10 +99,10 @@ bool DefaultAccessPolicy::CanChangeWindowOpacity(
          delegate_->HasRootForAccessPolicy(window);
 }
 
-bool DefaultAccessPolicy::CanSetWindowSurface(
+bool DefaultAccessPolicy::CanSetWindowCompositorFrameSink(
     const ServerWindow* window,
-    mojom::SurfaceType surface_type) const {
-  if (surface_type == mojom::SurfaceType::UNDERLAY)
+    mojom::CompositorFrameSinkType compositor_frame_sink_type) const {
+  if (compositor_frame_sink_type == mojom::CompositorFrameSinkType::UNDERLAY)
     return WasCreatedByThisClient(window);
 
   // Once a window embeds another app, the embedder app is no longer able to