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

services/ui/ws/window_server_test_impl.cc

Index: services/ui/ws/window_server_test_impl.cc
diff --git a/services/ui/ws/window_server_test_impl.cc b/services/ui/ws/window_server_test_impl.cc
index ec44ec3f691fa3f2cf07eaa2454a77d88cafcc52..8c069fc758a2a1e40ed109bbd5a6db2a2477d6af 100644
--- a/services/ui/ws/window_server_test_impl.cc
+++ b/services/ui/ws/window_server_test_impl.cc
@@ -6,7 +6,7 @@
 
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "services/ui/ws/server_window.h"
-#include "services/ui/ws/server_window_surface_manager.h"
+#include "services/ui/ws/server_window_compositor_frame_sink_manager.h"
 #include "services/ui/ws/window_server.h"
 #include "services/ui/ws/window_tree.h"
 
@@ -16,9 +16,12 @@ namespace ws {
 namespace {
 
 bool WindowHasValidFrame(const ServerWindow* window) {
-  const ServerWindowSurfaceManager* manager = window->surface_manager();
+  const ServerWindowCompositorFrameSinkManager* manager =
+      window->compositor_frame_sink_manager();
   return manager &&
-         !manager->GetDefaultSurface()->last_submitted_frame_size().IsEmpty();
+         !manager->GetDefaultCompositorFrameSink()
+              ->last_submitted_frame_size()
+              .IsEmpty();
 }
 
 }  // namespace