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

services/ui/ws/default_access_policy.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/ui/ws/default_access_policy.h"
 
 #include "services/ui/ws/access_policy_delegate.h"
 #include "services/ui/ws/server_window.h"
 
 namespace ui {
@@ skipping 81 matching lines @@
   return WasCreatedByThisClient(window) ||
          delegate_->HasRootForAccessPolicy(window);
 }
 
 bool DefaultAccessPolicy::CanChangeWindowOpacity(
     const ServerWindow* window) const {
   return WasCreatedByThisClient(window) ||
          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
   // call SetWindowSurfaceId() - this ability is transferred to the embedded
   // app.
   if (delegate_->IsWindowRootOfAnotherTreeForAccessPolicy(window))
     return false;
   return WasCreatedByThisClient(window) ||
          delegate_->HasRootForAccessPolicy(window);
 }
@@ skipping 100 matching lines @@
 bool DefaultAccessPolicy::IsValidIdForNewWindow(
     const ClientWindowId& id) const {
   // Clients using DefaultAccessPolicy only see windows they have created (for
   // the embed point they choose the id), so it's ok for clients to use whatever
   // id they want.
   return true;
 }
 
 }  // namespace ws
 }  // namespace ui