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

ash/mus/non_client_frame_controller.cc

Index: ash/mus/non_client_frame_controller.cc
diff --git a/ash/mus/non_client_frame_controller.cc b/ash/mus/non_client_frame_controller.cc
index b3bc8527b4cb9342debf23bce8e95ba1473e2e93..382f0d9aeb677ee50834b1ae129c03c8b57bcd41 100644
--- a/ash/mus/non_client_frame_controller.cc
+++ b/ash/mus/non_client_frame_controller.cc
@@ -222,7 +222,9 @@ class WmNativeWidgetMus : public views::NativeWidgetMus {
   WmNativeWidgetMus(views::internal::NativeWidgetDelegate* delegate,
                     ui::Window* window,
                     ui::WindowManagerClient* window_manager_client)
-      : NativeWidgetMus(delegate, window, ui::mojom::SurfaceType::UNDERLAY),
+      : NativeWidgetMus(delegate,
+                        window,
+                        ui::mojom::CompositorFrameSinkType::UNDERLAY),
         window_manager_client_(window_manager_client) {}
   ~WmNativeWidgetMus() override {}