Mus+Ash: Unify CompositorFrameSinks

services/ui/surfaces/direct_output_surface_ozone.h

 // Copyright 2016 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.
 
 #ifndef SERVICES_UI_SURFACES_DIRECT_OUTPUT_SURFACE_OZONE_H_
 #define SERVICES_UI_SURFACES_DIRECT_OUTPUT_SURFACE_OZONE_H_
 
 #include <memory>
 
 #include "base/memory/weak_ptr.h"
@@ skipping 13 matching lines @@
 namespace display_compositor {
 class BufferQueue;
 }
 
 namespace gpu {
 class GpuMemoryBufferManager;
 }
 
 namespace ui {
 
-class SurfacesContextProvider;
-
 // An OutputSurface implementation that directly draws and swap to a GL
 // "surfaceless" surface (aka one backed by a buffer managed explicitly in
 // mus/ozone. This class is adapted from
 // GpuSurfacelessBrowserCompositorOutputSurface.
 class DirectOutputSurfaceOzone : public cc::OutputSurface {
  public:
   DirectOutputSurfaceOzone(
-      scoped_refptr<SurfacesContextProvider> context_provider,
+      scoped_refptr<cc::ContextProvider> context_provider,
       gfx::AcceleratedWidget widget,
       cc::SyntheticBeginFrameSource* synthetic_begin_frame_source,
       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
       uint32_t target,
       uint32_t internalformat);
 
   ~DirectOutputSurfaceOzone() override;
 
   // TODO(rjkroege): Implement the equivalent of Reflector.
 
@@ skipping 31 matching lines @@
 
   gfx::Size reshape_size_;
   gfx::Size swap_size_;
 
   base::WeakPtrFactory<DirectOutputSurfaceOzone> weak_ptr_factory_;
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_SURFACES_DIRECT_OUTPUT_SURFACE_OZONE_H_