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

services/ui/ws/BUILD.gn

 # 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.
 
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 
 static_library("lib") {
@@ skipping 43 matching lines @@
     "platform_display.cc",
     "platform_display.h",
     "platform_display_delegate.h",
     "platform_display_factory.h",
     "platform_display_init_params.cc",
     "platform_display_init_params.h",
     "scheduled_animation_group.cc",
     "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",
     "user_activity_monitor.cc",
     "user_activity_monitor.h",
     "user_display_manager.cc",
     "user_display_manager.h",
     "user_display_manager_delegate.h",
     "user_id.h",
     "user_id_tracker.cc",
@@ skipping 117 matching lines @@
   sources = [
     "animation_runner_unittest.cc",
     "cursor_unittest.cc",
     "display_unittest.cc",
     "drag_controller_unittest.cc",
     "event_dispatcher_unittest.cc",
     "event_matcher_unittest.cc",
     "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",
     "test_utils.h",
     "transient_windows_unittest.cc",
     "user_activity_monitor_unittest.cc",
     "user_display_manager_unittest.cc",
     "window_coordinate_conversions_unittest.cc",
     "window_finder_unittest.cc",
     "window_manager_client_unittest.cc",
@@ skipping 37 matching lines @@
 
   data_deps = [
     ":mus_ws_unittests_app_manifest",
   ]
 }
 
 service_manifest("mus_ws_unittests_app_manifest") {
   name = "mus_ws_unittests_app"
   source = "mus_ws_unittests_app_manifest.json"
 }