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

ui/views/mus/window_manager_connection.cc

Index: ui/views/mus/window_manager_connection.cc
diff --git a/ui/views/mus/window_manager_connection.cc b/ui/views/mus/window_manager_connection.cc
index 75f7c382b77e35b41b7a049b545a61d4d4883dde..dc200eaa379f20aef42ae599e144cb1fa97d7410 100644
--- a/ui/views/mus/window_manager_connection.cc
+++ b/ui/views/mus/window_manager_connection.cc
@@ -131,7 +131,7 @@ NativeWidget* WindowManagerConnection::CreateNativeWidgetMus(
   properties[ui::mojom::WindowManager::kAppID_Property] =
       mojo::ConvertTo<std::vector<uint8_t>>(identity_.name());
   return new NativeWidgetMus(delegate, NewTopLevelWindow(properties),
-                             ui::mojom::SurfaceType::DEFAULT);
+                             ui::mojom::CompositorFrameSinkType::DEFAULT);
 }
 
 const std::set<ui::Window*>& WindowManagerConnection::GetRoots() const {