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

services/ui/ws/window_manager_access_policy.cc

Index: services/ui/ws/window_manager_access_policy.cc
diff --git a/services/ui/ws/window_manager_access_policy.cc b/services/ui/ws/window_manager_access_policy.cc
index 21e73795314868244bd78f63b769b119aa2f6c4a..37b3e1df74d653c600bbe40fd386b1d7574103fc 100644
--- a/services/ui/ws/window_manager_access_policy.cc
+++ b/services/ui/ws/window_manager_access_policy.cc
@@ -86,13 +86,13 @@ bool WindowManagerAccessPolicy::CanChangeWindowOpacity(
   return WasCreatedByThisClient(window);
 }
 
-bool WindowManagerAccessPolicy::CanSetWindowSurface(
+bool WindowManagerAccessPolicy::CanSetWindowCompositorFrameSink(
     const ServerWindow* window,
-    ui::mojom::SurfaceType surface_type) const {
+    ui::mojom::CompositorFrameSinkType compositor_frame_sink_type) const {
   // Allow the window manager to always provide the underlay. This is important
   // when the window manager is asked to paint the title area to windows it did
   // not create.
-  if (surface_type == mojom::SurfaceType::UNDERLAY)
+  if (compositor_frame_sink_type == mojom::CompositorFrameSinkType::UNDERLAY)
     return true;
 
   if (delegate_->IsWindowRootOfAnotherTreeForAccessPolicy(window))