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 b5253bb4f1a5d72483952f7e1b8f4b8cd0c00a74..a0c7b3f775d1f230ff0fe6af6d8c2d7e478cb7a9 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 {
@@ -176,8 +175,8 @@ void BitmapUploader::Upload() {
 void BitmapUploader::OnGpuChannelEstablished(
     scoped_refptr<gpu::GpuChannelHost> gpu_channel) {
   compositor_frame_sink_ = window_->RequestCompositorFrameSink(
-      mojom::SurfaceType::DEFAULT,
-      new ContextProvider(gpu_channel));
+      mojom::CompositorFrameSinkType::DEFAULT,
+      new ContextProvider(std::move(gpu_channel)));
   compositor_frame_sink_->BindToClient(this);
 }