Mus+Ash: Towards Unifying CompositorFrameSink terminology

ui/views/mus/surface_context_factory.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 "ui/views/mus/surface_context_factory.h"
 
 #include "base/memory/ptr_util.h"
 #include "cc/resources/shared_bitmap_manager.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "services/ui/public/cpp/compositor_frame_sink.h"
+#include "services/ui/public/cpp/context_provider.h"
 #include "services/ui/public/cpp/gpu_service.h"
 #include "services/ui/public/cpp/window.h"
 #include "ui/compositor/reflector.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/views/mus/native_widget_mus.h"
 
 namespace views {
 namespace {
 
 class FakeReflector : public ui::Reflector {
@@ skipping 10 matching lines @@
 SurfaceContextFactory::SurfaceContextFactory(ui::GpuService* gpu_service)
     : next_sink_id_(1u), gpu_service_(gpu_service) {}
 
 SurfaceContextFactory::~SurfaceContextFactory() {}
 
 void SurfaceContextFactory::CreateCompositorFrameSink(
     base::WeakPtr<ui::Compositor> compositor) {
   ui::Window* window = compositor->window();
   NativeWidgetMus* native_widget = NativeWidgetMus::GetForWindow(window);
   ui::mojom::SurfaceType surface_type = native_widget->surface_type();
-  auto compositor_frame_sink = base::MakeUnique<ui::CompositorFrameSink>(
-      gpu_service_->EstablishGpuChannelSync(),
-      window->RequestSurface(surface_type));
+  auto compositor_frame_sink = window->RequestCompositorFrameSink(
+      surface_type, make_scoped_refptr(new ui::ContextProvider(
+                        gpu_service_->EstablishGpuChannelSync())));
   compositor->SetCompositorFrameSink(std::move(compositor_frame_sink));
 }
 
 std::unique_ptr<ui::Reflector> SurfaceContextFactory::CreateReflector(
     ui::Compositor* mirroed_compositor,
     ui::Layer* mirroring_layer) {
   // NOTIMPLEMENTED();
   return base::WrapUnique(new FakeReflector);
 }
 
@@ skipping 47 matching lines @@
                                               bool visible) {
   // TODO(fsamuel): display[compositor]->SetVisible(visible);
 }
 
 void SurfaceContextFactory::ResizeDisplay(ui::Compositor* compositor,
                                           const gfx::Size& size) {
   // TODO(fsamuel): display[compositor]->Resize(size);
 }
 
 }  // namespace views