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

services/ui/demo/bitmap_uploader.cc

Index: services/ui/demo/bitmap_uploader.cc
diff --git a/services/ui/demo/bitmap_uploader.cc b/services/ui/demo/bitmap_uploader.cc
index bd71ac1702f1388d8dd653ddba91a6e41e0d7c27..1abb8649ebe73755a3a01825e92201b1d632cc1e 100644
--- a/services/ui/demo/bitmap_uploader.cc
+++ b/services/ui/demo/bitmap_uploader.cc
@@ -18,7 +18,6 @@
 #include "services/ui/public/cpp/gles2_context.h"
 #include "services/ui/public/cpp/gpu_service.h"
 #include "services/ui/public/cpp/window.h"
-#include "services/ui/public/cpp/window_surface.h"
 
 namespace ui {
 namespace {
@@ -41,7 +40,7 @@ BitmapUploader::BitmapUploader(Window* window)
 
 void BitmapUploader::Init(ui::GpuService* gpu_service) {
   compositor_frame_sink_ = window_->RequestCompositorFrameSink(
-      mojom::SurfaceType::DEFAULT,
+      mojom::CompositorFrameSinkType::DEFAULT,
       new ContextProvider(gpu_service->EstablishGpuChannelSync()));
   compositor_frame_sink_->BindToClient(this);
 }