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

services/ui/demo/bitmap_uploader.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/ui/demo/bitmap_uploader.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "cc/ipc/compositor_frame.mojom.h"
 #include "cc/quads/render_pass.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "services/ui/public/cpp/context_provider.h"
 #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 {
 
 const uint32_t g_transparent_color = 0x00000000;
 
 }  // namespace
 
 const char kBitmapUploaderForAcceleratedWidget[] =
     "__BITMAP_UPLOADER_ACCELERATED_WIDGET__";
 
 BitmapUploader::BitmapUploader(Window* window)
     : window_(window),
       color_(g_transparent_color),
       width_(0),
       height_(0),
       format_(BGRA),
       next_resource_id_(1u) {
 }
 
 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);
 }
 
 BitmapUploader::~BitmapUploader() {
   compositor_frame_sink_->DetachFromClient();
 }
 
 // Sets the color which is RGBA.
 void BitmapUploader::SetColor(uint32_t color) {
@@ skipping 161 matching lines @@
                             const gfx::Rect& viewport,
                             bool resourceless_software_draw) {}
 
 void BitmapUploader::SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) {}
 
 void BitmapUploader::SetExternalTilePriorityConstraints(
     const gfx::Rect& viewport_rect,
     const gfx::Transform& transform) {}
 
 }  // namespace ui