Use MojoCompositorFrameSink in RendererCompositorFrameSink

content/browser/renderer_host/render_widget_host_view_android.cc

Index: content/browser/renderer_host/render_widget_host_view_android.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
index c1c8a006a556189f43f37a2fc4422b46cca73650..f9fb39428dcc420a63006d126ac8d7a2b1781c6b 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -1111,8 +1111,10 @@ RenderWidgetHostViewAndroid::CreateSyntheticGestureTarget() {
 void RenderWidgetHostViewAndroid::SendReclaimCompositorResources(
     bool is_swap_ack) {
   DCHECK(host_);
-  host_->SendReclaimCompositorResources(is_swap_ack,
-                                        surface_returned_resources_);
+  if (is_swap_ack)
+    renderer_compositor_frame_sink_->DidReceiveCompositorFrameAck();
+  renderer_compositor_frame_sink_->ReclaimResources(
+      surface_returned_resources_);
   surface_returned_resources_.clear();
 }
 
@@ -1130,8 +1132,10 @@ void RenderWidgetHostViewAndroid::ReclaimResources(
     SendReclaimCompositorResources(false /* is_swap_ack */);
 }
 
-void RenderWidgetHostViewAndroid::DidCreateNewRendererCompositorFrameSink() {
+void RenderWidgetHostViewAndroid::DidCreateNewRendererCompositorFrameSink(
+    cc::mojom::MojoCompositorFrameSinkClient* renderer_compositor_frame_sink) {
   delegated_frame_host_->CompositorFrameSinkChanged();
+  renderer_compositor_frame_sink_ = renderer_compositor_frame_sink;
   // Accumulated resources belong to the old RendererCompositorFrameSink and
   // should not be returned.
   surface_returned_resources_.clear();
@@ -1571,9 +1575,12 @@ void RenderWidgetHostViewAndroid::SendBeginFrame(cc::BeginFrameArgs args) {
   // switches to Surfaces and the Browser's commit isn't in the critical path.
   args.deadline = sync_compositor_ ? base::TimeTicks()
   : args.frame_time + (args.interval * 0.6);
-  host_->Send(new ViewMsg_BeginFrame(host_->GetRoutingID(), args));
-  if (sync_compositor_)
+  if (sync_compositor_) {
+    host_->Send(new ViewMsg_BeginFrame(host_->GetRoutingID(), args));
     sync_compositor_->DidSendBeginFrame(view_.GetWindowAndroid());
+  } else {
+    renderer_compositor_frame_sink_->OnBeginFrame(args);
+  }
 }
 
 bool RenderWidgetHostViewAndroid::Animate(base::TimeTicks frame_time) {