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

services/ui/ws/window_server.cc

Index: services/ui/ws/window_server.cc
diff --git a/services/ui/ws/window_server.cc b/services/ui/ws/window_server.cc
index 3a463cc0ad041a082538a53ee37355b362fb162e..392e43df22c13411ff9e40f5d43fb1503ff7c3be 100644
--- a/services/ui/ws/window_server.cc
+++ b/services/ui/ws/window_server.cc
@@ -804,11 +804,12 @@ void WindowServer::OnSurfaceCreated(const cc::SurfaceId& surface_id,
                                     float device_scale_factor) {
   WindowId window_id(
       WindowIdFromTransportId(surface_id.frame_sink_id().client_id()));
-  mojom::SurfaceType surface_type(
-      static_cast<mojom::SurfaceType>(surface_id.frame_sink_id().sink_id()));
+  mojom::CompositorFrameSinkType surface_type(
+      static_cast<mojom::CompositorFrameSinkType>(
+          surface_id.frame_sink_id().sink_id()));
   // We only care about propagating default surface IDs.
   // TODO(fsamuel, sadrul): we should get rid of surface types.
-  if (surface_type != mojom::SurfaceType::DEFAULT)
+  if (surface_type != mojom::CompositorFrameSinkType::DEFAULT)
     return;
   ServerWindow* window = GetWindow(window_id);
   // If the window doesn't have a parent then we have nothing to propagate.