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

ash/mus/native_widget_factory_mus.cc

Index: ash/mus/native_widget_factory_mus.cc
diff --git a/ash/mus/native_widget_factory_mus.cc b/ash/mus/native_widget_factory_mus.cc
index 6e9bceec804e9d1b7ace300a27f84f6868b3359e..9660223a79c9bc1dd0fd61e8785a90fff88af5c2 100644
--- a/ash/mus/native_widget_factory_mus.cc
+++ b/ash/mus/native_widget_factory_mus.cc
@@ -28,9 +28,9 @@ views::NativeWidget* CreateNativeWidgetMus(
     return nullptr;
   std::map<std::string, std::vector<uint8_t>> props;
   views::NativeWidgetMus::ConfigurePropertiesForNewWindow(init_params, &props);
-  return new views::NativeWidgetMus(delegate,
-                                    window_manager->NewTopLevelWindow(&props),
-                                    ui::mojom::SurfaceType::DEFAULT);
+  return new views::NativeWidgetMus(
+      delegate, window_manager->NewTopLevelWindow(&props),
+      ui::mojom::CompositorFrameSinkType::DEFAULT);
 }
 
 }  // namespace