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

services/ui/public/cpp/BUILD.gn

Index: services/ui/public/cpp/BUILD.gn
diff --git a/services/ui/public/cpp/BUILD.gn b/services/ui/public/cpp/BUILD.gn
index df0b3ebfd8a0537ca45873206771fcffb934b6f8..c21676094731ef40381c81b79c644013f98a0bab 100644
--- a/services/ui/public/cpp/BUILD.gn
+++ b/services/ui/public/cpp/BUILD.gn
@@ -8,7 +8,6 @@ import("//build/config/ui.gni")
 # implementation (and private haders) are in 'internal'.
 source_set("cpp") {
   sources = [
-    "compositor_frame_sink.h",
     "context_provider.h",
     "gpu_service.h",
     "input_event_handler.h",
@@ -18,11 +17,10 @@ source_set("cpp") {
     "scoped_window_ptr.h",
     "surface_id_handler.h",
     "window.h",
+    "window_compositor_frame_sink.h",
     "window_manager_delegate.h",
     "window_observer.h",
     "window_property.h",
-    "window_surface.h",
-    "window_surface_client.h",
     "window_tracker.h",
     "window_tree_client.h",
     "window_tree_client_delegate.h",
@@ -97,7 +95,6 @@ source_set("internal") {
   ]
 
   sources = [
-    "compositor_frame_sink.cc",
     "context_provider.cc",
     "gles2_context.cc",
     "gles2_context.h",
@@ -115,10 +112,10 @@ source_set("internal") {
     "raster_thread_helper.cc",
     "scoped_window_ptr.cc",
     "window.cc",
+    "window_compositor_frame_sink.cc",
     "window_manager_delegate.cc",
     "window_observer.cc",
     "window_private.cc",
-    "window_surface.cc",
     "window_tree_client.cc",
     "window_tree_client_delegate.cc",
     "window_tree_host_factory.cc",