Mus+Ash: Unify CompositorFrameSinks

services/ui/surfaces/direct_output_surface_ozone.cc

Index: services/ui/surfaces/direct_output_surface_ozone.cc
diff --git a/services/ui/surfaces/direct_output_surface_ozone.cc b/services/ui/surfaces/direct_output_surface_ozone.cc
index 99262d177ae06452eb906ebf93d52dc1c79cb5ec..f022a5a2b7a1a350eb755dbc53afc7049a3fb0d0 100644
--- a/services/ui/surfaces/direct_output_surface_ozone.cc
+++ b/services/ui/surfaces/direct_output_surface_ozone.cc
@@ -23,7 +23,7 @@ using display_compositor::BufferQueue;
 namespace ui {
 
 DirectOutputSurfaceOzone::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,
@@ -52,9 +52,10 @@ DirectOutputSurfaceOzone::DirectOutputSurfaceOzone(
 
   buffer_queue_->Initialize();
 
-  context_provider->SetSwapBuffersCompletionCallback(
-      base::Bind(&DirectOutputSurfaceOzone::OnGpuSwapBuffersCompleted,
-                 base::Unretained(this)));
+  static_cast<SurfacesContextProvider*>(context_provider.get())

[kylechar, 2016/11/02 03:37:24]

Ditto.

[Fady Samuel, 2016/11/02 04:31:22]

Done.

+      ->SetSwapBuffersCompletionCallback(
+          base::Bind(&DirectOutputSurfaceOzone::OnGpuSwapBuffersCompleted,
+                     base::Unretained(this)));
 }
 
 DirectOutputSurfaceOzone::~DirectOutputSurfaceOzone() {