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

services/ui/public/cpp/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")
 
 # This is the public target. It contains only the public headers. The
 # 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",
     "mojo_gpu_memory_buffer_manager.h",
     "property_type_converters.h",
     "raster_thread_helper.h",
     "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",
     "window_tree_client_observer.h",
     "window_tree_host_factory.h",
   ]
 
   public_deps = [
     "//base",
     "//cc",
@@ skipping 54 matching lines @@
 
 source_set("internal") {
   # This target is an implementation detail and is intended only to be used by
   # the 'cpp' target.
   visibility = [
     ":cpp",
     "//services/ui/demo:mus_demo_lib",
   ]
 
   sources = [
-    "compositor_frame_sink.cc",
     "context_provider.cc",
     "gles2_context.cc",
     "gles2_context.h",
     "gpu_memory_buffer_impl.cc",
     "gpu_memory_buffer_impl.h",
     "gpu_service.cc",
     "in_flight_change.cc",
     "in_flight_change.h",
     "mojo_buffer_backing.cc",
     "mojo_buffer_backing.h",
     "mojo_gpu_memory_buffer.cc",
     "mojo_gpu_memory_buffer.h",
     "mojo_gpu_memory_buffer_manager.cc",
     "property_type_converters.cc",
     "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",
   ]
 
   deps = [
     ":internal_or_test",
     "//base",
     "//cc",
     "//cc/surfaces",
@@ skipping 18 matching lines @@
   data_deps = [
     "//services/ui",
   ]
 
   defines = [ "GL_GLEXT_PROTOTYPES" ]
 
   if (use_ozone) {
     deps += [ "//ui/ozone" ]
   }
 }