Make RendererCompositorFrameSink derive from ClientCompositorFrameSink

services/ui/public/cpp/client_compositor_frame_sink.h

Index: services/ui/public/cpp/client_compositor_frame_sink.h
diff --git a/services/ui/public/cpp/client_compositor_frame_sink.h b/services/ui/public/cpp/client_compositor_frame_sink.h
index d0b0aceb469d66bfbe7b478b001c5a66bf0742f7..f72fbbe5f7c34c4231497f41447cfbc17fd4fc59 100644
--- a/services/ui/public/cpp/client_compositor_frame_sink.h
+++ b/services/ui/public/cpp/client_compositor_frame_sink.h
@@ -23,7 +23,19 @@ class ClientCompositorFrameSink
  public:
   ClientCompositorFrameSink(
       scoped_refptr<cc::ContextProvider> context_provider,
+      scoped_refptr<cc::ContextProvider> worker_context_provider,
       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
+      cc::SharedBitmapManager* shared_bitmap_manager,
+      std::unique_ptr<cc::SyntheticBeginFrameSource>
+          synthetic_begin_frame_source,
+      cc::mojom::MojoCompositorFrameSinkPtrInfo compositor_frame_sink_info,
+      cc::mojom::MojoCompositorFrameSinkClientRequest client_request,
+      bool enable_surface_synchronization);
+
+  ClientCompositorFrameSink(
+      scoped_refptr<cc::VulkanContextProvider> vulkan_context_provider,
+      std::unique_ptr<cc::SyntheticBeginFrameSource>
+          synthetic_begin_frame_source,
       cc::mojom::MojoCompositorFrameSinkPtrInfo compositor_frame_sink_info,
       cc::mojom::MojoCompositorFrameSinkClientRequest client_request,
       bool enable_surface_synchronization);
@@ -37,13 +49,18 @@ class ClientCompositorFrameSink
   void SubmitCompositorFrame(cc::CompositorFrame frame) override;
   void DidNotProduceFrame(const cc::BeginFrameAck& ack) override;
 
- private:
+ protected:
+  cc::mojom::MojoCompositorFrameSink* sink() {
+    return compositor_frame_sink_.get();
+  }
+
   // cc::mojom::MojoCompositorFrameSinkClient implementation:
   void DidReceiveCompositorFrameAck(
       const cc::ReturnedResourceArray& resources) override;
   void OnBeginFrame(const cc::BeginFrameArgs& begin_frame_args) override;
   void ReclaimResources(const cc::ReturnedResourceArray& resources) override;
 
+ private:
   // cc::ExternalBeginFrameSourceClient implementation.
   void OnNeedsBeginFrames(bool needs_begin_frames) override;
 
@@ -51,12 +68,12 @@ class ClientCompositorFrameSink
   cc::LocalSurfaceId local_surface_id_;
   cc::LocalSurfaceIdAllocator id_allocator_;
   std::unique_ptr<cc::ExternalBeginFrameSource> begin_frame_source_;
+  std::unique_ptr<cc::SyntheticBeginFrameSource> synthetic_begin_frame_source_;
   cc::mojom::MojoCompositorFrameSinkPtrInfo compositor_frame_sink_info_;
   cc::mojom::MojoCompositorFrameSinkClientRequest client_request_;
   cc::mojom::MojoCompositorFrameSinkPtr compositor_frame_sink_;
-  std::unique_ptr<mojo::Binding<cc::mojom::MojoCompositorFrameSinkClient>>
-      client_binding_;
-  std::unique_ptr<base::ThreadChecker> thread_checker_;
+  mojo::Binding<cc::mojom::MojoCompositorFrameSinkClient> client_binding_;
+  THREAD_CHECKER(thread_checker_);
   const bool enable_surface_synchronization_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientCompositorFrameSink);