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

services/ui/ws/BUILD.gn

Index: services/ui/ws/BUILD.gn
diff --git a/services/ui/ws/BUILD.gn b/services/ui/ws/BUILD.gn
index 8bdb1bdd4ec3f28024e85e0158844a2f7dc5e258..5d374fa8a2e732ed0421d8745f99744007e8d0e7 100644
--- a/services/ui/ws/BUILD.gn
+++ b/services/ui/ws/BUILD.gn
@@ -61,15 +61,15 @@ static_library("lib") {
     "scheduled_animation_group.h",
     "server_window.cc",
     "server_window.h",
+    "server_window_compositor_frame_sink.cc",
+    "server_window_compositor_frame_sink.h",
+    "server_window_compositor_frame_sink_manager.cc",
+    "server_window_compositor_frame_sink_manager.h",
     "server_window_delegate.h",
     "server_window_drawn_tracker.cc",
     "server_window_drawn_tracker.h",
     "server_window_drawn_tracker_observer.h",
     "server_window_observer.h",
-    "server_window_surface.cc",
-    "server_window_surface.h",
-    "server_window_surface_manager.cc",
-    "server_window_surface_manager.h",
     "server_window_tracker.h",
     "touch_controller.cc",
     "touch_controller.h",
@@ -207,9 +207,9 @@ test("mus_ws_unittests") {
     "focus_controller_unittest.cc",
     "frame_generator_unittest.cc",
     "scheduled_animation_group_unittest.cc",
+    "server_window_compositor_frame_sink_manager_test_api.cc",
+    "server_window_compositor_frame_sink_manager_test_api.h",
     "server_window_drawn_tracker_unittest.cc",
-    "server_window_surface_manager_test_api.cc",
-    "server_window_surface_manager_test_api.h",
     "test_server_window_delegate.cc",
     "test_server_window_delegate.h",
     "test_utils.cc",