Mus+Ash: Towards Unifying CompositorFrameSink terminology

services/ui/public/cpp/compositor_frame_sink.h

Index: services/ui/public/cpp/compositor_frame_sink.h
diff --git a/services/ui/public/cpp/compositor_frame_sink.h b/services/ui/public/cpp/compositor_frame_sink.h
index 771e5354bdc2c14e4f2bdcbe8bb568514ada37d3..2ea0d1aecc0db411bd43b1d8938580197c335c8e 100644
--- a/services/ui/public/cpp/compositor_frame_sink.h
+++ b/services/ui/public/cpp/compositor_frame_sink.h
@@ -7,6 +7,7 @@
 
 #include "base/macros.h"
 #include "cc/output/compositor_frame_sink.h"
+#include "cc/output/context_provider.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/surfaces/surface_id.h"
 #include "mojo/public/cpp/bindings/binding.h"
@@ -22,7 +23,7 @@ namespace ui {
 class CompositorFrameSink : public cc::CompositorFrameSink,
                             public WindowSurfaceClient {
  public:
-  CompositorFrameSink(scoped_refptr<gpu::GpuChannelHost> gpu_channel_host,
+  CompositorFrameSink(scoped_refptr<cc::ContextProvider> context_provider,
                       std::unique_ptr<WindowSurface> surface);
   ~CompositorFrameSink() override;
 
@@ -33,8 +34,8 @@ class CompositorFrameSink : public cc::CompositorFrameSink,
 
  private:
   // WindowSurfaceClient implementation:
-  void OnResourcesReturned(WindowSurface* surface,
-                           const cc::ReturnedResourceArray& resources) override;
+  void DidReceiveCompositorFrameAck() override;
+  void ReclaimResources(const cc::ReturnedResourceArray& resources) override;
 
   std::unique_ptr<cc::BeginFrameSource> begin_frame_source_;
   std::unique_ptr<WindowSurface> surface_;