Clean up old Mojo types for interfaces from compositor_frame_sink.mojom

This CL cleans up old Mojo types for CompositorFrameSinkClient and
CompositorFrameSink from SynchronousLayerTreeFrameSink and uses
PendingReceiver, Receiver, and PendingRemote instead of them.

Bug: 955171
Change-Id: Id0aa5d5dc2409a1de878764514b599a12dcce46b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1935973Reviewed-by: Bo <boliu@chromium.org>
Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
Commit-Queue: Julie Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#719382}

content/browser/renderer_host/mock_render_widget_host.cc

@@ -56,7 +56,7 @@ void MockRenderWidgetHost::ExpectForceEnableZoom(bool enable) {
 }
 
 // Mocks out |renderer_compositor_frame_sink_| with a
-// CompositorFrameSinkClientPtr bound to
+// CompositorFrameSinkClient bound to
 // |mock_renderer_compositor_frame_sink|.
 void MockRenderWidgetHost::SetMockRendererCompositorFrameSink(
     viz::MockCompositorFrameSinkClient* mock_renderer_compositor_frame_sink) {

content/browser/renderer_host/mock_render_widget_host.h

@@ -57,7 +57,7 @@ class MockRenderWidgetHost : public RenderWidgetHostImpl {
   }
 
   // Mocks out |renderer_compositor_frame_sink_| with a
-  // CompositorFrameSinkClientPtr bound to
+  // CompositorFrameSinkClient bound to
   // |mock_renderer_compositor_frame_sink|.
   void SetMockRendererCompositorFrameSink(
       viz::MockCompositorFrameSinkClient* mock_renderer_compositor_frame_sink);

content/renderer/android/synchronous_layer_tree_frame_sink.cc

@@ -150,8 +150,10 @@ SynchronousLayerTreeFrameSink::SynchronousLayerTreeFrameSink(
     std::unique_ptr<viz::BeginFrameSource> synthetic_begin_frame_source,
     SynchronousCompositorRegistry* registry,
     scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue,
-    viz::mojom::CompositorFrameSinkPtrInfo compositor_frame_sink_info,
-    viz::mojom::CompositorFrameSinkClientRequest client_request)
+    mojo::PendingRemote<viz::mojom::CompositorFrameSink>
+        compositor_frame_sink_remote,
+    mojo::PendingReceiver<viz::mojom::CompositorFrameSinkClient>
+        client_receiver)
     : cc::LayerTreeFrameSink(std::move(context_provider),
                              std::move(worker_context_provider),
                              std::move(compositor_task_runner),
@@ -162,9 +164,8 @@ SynchronousLayerTreeFrameSink::SynchronousLayerTreeFrameSink(
       sender_(sender),
       memory_policy_(0u),
       frame_swap_message_queue_(frame_swap_message_queue),
-      unbound_compositor_frame_sink_(std::move(compositor_frame_sink_info)),
-      unbound_client_(std::move(client_request)),
-      client_binding_(this),
+      unbound_compositor_frame_sink_(std::move(compositor_frame_sink_remote)),
+      unbound_client_(std::move(client_receiver)),
       synthetic_begin_frame_source_(std::move(synthetic_begin_frame_source)),
       viz_for_webview_enabled_(features::IsUsingVizForWebView()) {
   DCHECK(registry_);
@@ -189,7 +190,7 @@ bool SynchronousLayerTreeFrameSink::BindToClient(
 
   if (viz_for_webview_enabled_) {
     compositor_frame_sink_.Bind(std::move(unbound_compositor_frame_sink_));
-    client_binding_.Bind(std::move(unbound_client_), compositor_task_runner_);
+    client_receiver_.Bind(std::move(unbound_client_), compositor_task_runner_);
   }
 
   // The SharedBitmapManager is null since software compositing is not supported
@@ -265,7 +266,7 @@ void SynchronousLayerTreeFrameSink::DetachFromClient() {
   display_ = nullptr;
   frame_sink_manager_ = nullptr;
 
-  client_binding_.Close();
+  client_receiver_.reset();
   compositor_frame_sink_.reset();
 
   cc::LayerTreeFrameSink::DetachFromClient();

content/renderer/android/synchronous_layer_tree_frame_sink.h

@@ -27,7 +27,9 @@
 #include "components/viz/service/display/display_client.h"
 #include "components/viz/service/display_embedder/server_shared_bitmap_manager.h"
 #include "ipc/ipc_message.h"
-#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
+#include "mojo/public/cpp/bindings/pending_remote.h"
+#include "mojo/public/cpp/bindings/receiver.h"
 #include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
 #include "ui/gfx/transform.h"
 
@@ -90,8 +92,10 @@ class SynchronousLayerTreeFrameSink
       std::unique_ptr<viz::BeginFrameSource> begin_frame_source,
       SynchronousCompositorRegistry* registry,
       scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue,
-      viz::mojom::CompositorFrameSinkPtrInfo compositor_frame_sink_info,
-      viz::mojom::CompositorFrameSinkClientRequest client_request);
+      mojo::PendingRemote<viz::mojom::CompositorFrameSink>
+          compositor_frame_sink_remote,
+      mojo::PendingReceiver<viz::mojom::CompositorFrameSinkClient>
+          client_receiver);
   ~SynchronousLayerTreeFrameSink() override;
 
   void SetSyncClient(SynchronousLayerTreeFrameSinkClient* compositor);
@@ -174,10 +178,11 @@ class SynchronousLayerTreeFrameSink
   bool fallback_tick_pending_ = false;
   bool fallback_tick_running_ = false;
 
-  viz::mojom::CompositorFrameSinkPtrInfo unbound_compositor_frame_sink_;
-  viz::mojom::CompositorFrameSinkClientRequest unbound_client_;
+  mojo::PendingRemote<viz::mojom::CompositorFrameSink>
+      unbound_compositor_frame_sink_;
+  mojo::PendingReceiver<viz::mojom::CompositorFrameSinkClient> unbound_client_;
   viz::mojom::CompositorFrameSinkPtr compositor_frame_sink_;
-  mojo::Binding<viz::mojom::CompositorFrameSinkClient> client_binding_;
+  mojo::Receiver<viz::mojom::CompositorFrameSinkClient> client_receiver_{this};
   viz::LocalSurfaceId local_surface_id_;
 
   class StubDisplayClient : public viz::DisplayClient {