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

services/ui/ws/default_access_policy.h

 // 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.
 
 #ifndef SERVICES_UI_WS_DEFAULT_ACCESS_POLICY_H_
 #define SERVICES_UI_WS_DEFAULT_ACCESS_POLICY_H_
 
 #include <stdint.h>
 
 #include "base/macros.h"
@@ skipping 24 matching lines @@
   bool CanReorderWindow(const ServerWindow* window,
                         const ServerWindow* relative_window,
                         mojom::OrderDirection direction) const override;
   bool CanDeleteWindow(const ServerWindow* window) const override;
   bool CanGetWindowTree(const ServerWindow* window) const override;
   bool CanDescendIntoWindowForWindowTree(
       const ServerWindow* window) const override;
   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 surface_type) const override;
   bool CanSetWindowBounds(const ServerWindow* window) const override;
   bool CanSetWindowProperties(const ServerWindow* window) const override;
   bool CanSetWindowTextInputState(const ServerWindow* window) const override;
   bool CanSetCapture(const ServerWindow* window) const override;
   bool CanSetFocus(const ServerWindow* window) const override;
   bool CanSetClientArea(const ServerWindow* window) const override;
   bool CanSetHitTestMask(const ServerWindow* window) const override;
   bool CanSetAcceptDrops(const ServerWindow* window) const override;
   bool CanSetAcceptEvents(const ServerWindow* window) const override;
   bool CanSetCursorProperties(const ServerWindow* window) const override;
@@ skipping 14 matching lines @@
   ClientSpecificId client_id_ = 0u;
   AccessPolicyDelegate* delegate_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultAccessPolicy);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_DEFAULT_ACCESS_POLICY_H_