Clean up old Mojo type for mojom::DisplayClient

This CL cleans up old mojo types for mojom::DisplayClient
using Receiver and PendingRemote.

Bug: 955171
Change-Id: I18ebf4160c0c350b76689693ee7176d1e7185b14
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1895029Reviewed-by: Ken Rockot <rockot@google.com>
Reviewed-by: Eric Karl <ericrk@chromium.org>
Reviewed-by: Sam McNally <sammc@chromium.org>
Reviewed-by: enne <enne@chromium.org>
Commit-Queue: Julie Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#712453}

components/viz/demo/host/demo_host.cc

@@ -129,8 +129,7 @@ void DemoHost::Initialize(
   auto client_receiver = root_params->compositor_frame_sink_client
                              .InitWithNewPipeAndPassReceiver();
   root_params->display_private = mojo::MakeRequest(&display_private_);
-  root_params->display_client =
-      display_client_->GetBoundPtr(nullptr).PassInterface();
+  root_params->display_client = display_client_->GetBoundRemote(nullptr);
 
   constexpr viz::FrameSinkId root_frame_sink_id(0xdead, 0xbeef);
   root_params->frame_sink_id = root_frame_sink_id;

components/viz/host/host_display_client.cc

@@ -18,8 +18,7 @@
 
 namespace viz {
 
-HostDisplayClient::HostDisplayClient(gfx::AcceleratedWidget widget)
-    : binding_(this) {
+HostDisplayClient::HostDisplayClient(gfx::AcceleratedWidget widget) {
 #if defined(OS_MACOSX) || defined(OS_WIN)
   widget_ = widget;
 #endif
@@ -27,11 +26,9 @@ HostDisplayClient::HostDisplayClient(gfx::AcceleratedWidget widget)
 
 HostDisplayClient::~HostDisplayClient() = default;
 
-mojom::DisplayClientPtr HostDisplayClient::GetBoundPtr(
+mojo::PendingRemote<mojom::DisplayClient> HostDisplayClient::GetBoundRemote(
     scoped_refptr<base::SingleThreadTaskRunner> task_runner) {
-  mojom::DisplayClientPtr ptr;
-  binding_.Bind(mojo::MakeRequest(&ptr), task_runner);
-  return ptr;
+  return receiver_.BindNewPipeAndPassRemote(task_runner);
 }
 
 #if defined(OS_MACOSX)

components/viz/host/host_display_client.h

@@ -12,7 +12,8 @@
 #include "base/single_thread_task_runner.h"
 #include "build/build_config.h"
 #include "components/viz/host/viz_host_export.h"
-#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/pending_remote.h"
+#include "mojo/public/cpp/bindings/receiver.h"
 #include "services/viz/privileged/mojom/compositing/display_private.mojom.h"
 #include "ui/gfx/native_widget_types.h"
 
@@ -27,7 +28,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom::DisplayClient {
   explicit HostDisplayClient(gfx::AcceleratedWidget widget);
   ~HostDisplayClient() override;
 
-  mojom::DisplayClientPtr GetBoundPtr(
+  mojo::PendingRemote<mojom::DisplayClient> GetBoundRemote(
       scoped_refptr<base::SingleThreadTaskRunner> task_runner);
 
  private:
@@ -46,7 +47,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom::DisplayClient {
   void DidCompleteSwapWithNewSize(const gfx::Size& size) override;
 #endif
 
-  mojo::Binding<mojom::DisplayClient> binding_;
+  mojo::Receiver<mojom::DisplayClient> receiver_{this};
 #if defined(OS_MACOSX) || defined(OS_WIN)
   gfx::AcceleratedWidget widget_;
 #endif

components/viz/host/host_frame_sink_manager_unittest.cc

@@ -58,7 +58,7 @@ struct RootCompositorFrameSinkData {
     params->compositor_frame_sink_client =
         compositor_frame_sink_client.BindInterfaceRemote();
     params->display_private = MakeRequest(&display_private);
-    params->display_client = display_client.BindInterfacePtr().PassInterface();
+    params->display_client = display_client.BindRemote();
     return params;
   }
 

components/viz/service/compositor_frame_fuzzer/fuzzer_browser_process.cc

@@ -104,7 +104,7 @@ FuzzerBrowserProcess::BuildRootCompositorFrameSinkParams() {
       root_compositor_frame_sink_client_.BindInterfaceRemote();
   params->display_private =
       MakeRequestAssociatedWithDedicatedPipe(&display_private_);
-  params->display_client = display_client_.BindInterfacePtr().PassInterface();
+  params->display_client = display_client_.BindRemote();
   params->external_begin_frame_controller =
       MakeRequestAssociatedWithDedicatedPipe(
           &external_begin_frame_controller_ptr_);

components/viz/service/frame_sinks/frame_sink_manager_unittest.cc

@@ -44,7 +44,7 @@ struct RootCompositorFrameSinkData {
     params->compositor_frame_sink_client =
         compositor_frame_sink_client.BindInterfaceRemote();
     params->display_private = MakeRequest(&display_private);
-    params->display_client = display_client.BindInterfacePtr().PassInterface();
+    params->display_client = display_client.BindRemote();
     return params;
   }
 

components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc

@@ -34,8 +34,8 @@ RootCompositorFrameSinkImpl::Create(
     uint32_t restart_id,
     bool run_all_compositor_stages_before_draw) {
   // First create an output surface.
-  mojom::DisplayClientPtr display_client =
-      mojom::DisplayClientPtr(std::move(params->display_client));
+  mojo::Remote<mojom::DisplayClient> display_client(
+      std::move(params->display_client));
   auto output_surface = output_surface_provider->CreateOutputSurface(
       params->widget, params->gpu_compositing, display_client.get(),
       params->renderer_settings);
@@ -294,7 +294,7 @@ RootCompositorFrameSinkImpl::RootCompositorFrameSinkImpl(
         frame_sink_receiver,
     mojo::PendingRemote<mojom::CompositorFrameSinkClient> frame_sink_client,
     mojom::DisplayPrivateAssociatedRequest display_request,
-    mojom::DisplayClientPtr display_client,
+    mojo::Remote<mojom::DisplayClient> display_client,
     std::unique_ptr<SyntheticBeginFrameSource> synthetic_begin_frame_source,
     std::unique_ptr<ExternalBeginFrameSource> external_begin_frame_source,
     std::unique_ptr<Display> display)

components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h

@@ -98,7 +98,7 @@ class RootCompositorFrameSinkImpl : public mojom::CompositorFrameSink,
           frame_sink_receiver,
       mojo::PendingRemote<mojom::CompositorFrameSinkClient> frame_sink_client,
       mojom::DisplayPrivateAssociatedRequest display_request,
-      mojom::DisplayClientPtr display_client,
+      mojo::Remote<mojom::DisplayClient> display_client,
       std::unique_ptr<SyntheticBeginFrameSource> synthetic_begin_frame_source,
       std::unique_ptr<ExternalBeginFrameSource> external_begin_frame_source,
       std::unique_ptr<Display> display);
@@ -120,8 +120,8 @@ class RootCompositorFrameSinkImpl : public mojom::CompositorFrameSink,
   mojo::Remote<mojom::CompositorFrameSinkClient> compositor_frame_sink_client_;
   mojo::AssociatedReceiver<mojom::CompositorFrameSink>
       compositor_frame_sink_receiver_;
-  // |display_client_| may be nullptr on platforms that do not use it.
-  mojom::DisplayClientPtr display_client_;
+  // |display_client_| may be NullRemote on platforms that do not use it.
+  mojo::Remote<mojom::DisplayClient> display_client_;
   mojo::AssociatedBinding<mojom::DisplayPrivate> display_private_binding_;
 
   std::unique_ptr<VSyncParameterListener> vsync_listener_;

components/viz/test/fake_display_client.cc

@@ -6,13 +6,11 @@
 
 namespace viz {
 
-FakeDisplayClient::FakeDisplayClient() : binding_(this) {}
+FakeDisplayClient::FakeDisplayClient() = default;
 FakeDisplayClient::~FakeDisplayClient() = default;
 
-mojom::DisplayClientPtr FakeDisplayClient::BindInterfacePtr() {
-  mojom::DisplayClientPtr ptr;
-  binding_.Bind(MakeRequest(&ptr));
-  return ptr;
+mojo::PendingRemote<mojom::DisplayClient> FakeDisplayClient::BindRemote() {
+  return receiver_.BindNewPipeAndPassRemote();
 }
 
 #if defined(OS_MACOSX)

components/viz/test/fake_display_client.h

@@ -8,7 +8,8 @@
 #include <vector>
 
 #include "build/build_config.h"
-#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/pending_remote.h"
+#include "mojo/public/cpp/bindings/receiver.h"
 #include "services/viz/privileged/mojom/compositing/display_private.mojom.h"
 
 namespace viz {
@@ -18,7 +19,7 @@ class FakeDisplayClient : public mojom::DisplayClient {
   FakeDisplayClient();
   ~FakeDisplayClient() override;
 
-  mojom::DisplayClientPtr BindInterfacePtr();
+  mojo::PendingRemote<mojom::DisplayClient> BindRemote();
 
   // mojom::DisplayClient implementation.
 #if defined(OS_MACOSX)
@@ -36,7 +37,7 @@ class FakeDisplayClient : public mojom::DisplayClient {
 #endif
 
  private:
-  mojo::Binding<mojom::DisplayClient> binding_;
+  mojo::Receiver<mojom::DisplayClient> receiver_{this};
 
   DISALLOW_COPY_AND_ASSIGN(FakeDisplayClient);
 };

components/viz/test/mock_display_client.cc

@@ -6,14 +6,12 @@
 
 namespace viz {
 
-MockDisplayClient::MockDisplayClient() : binding_(this) {}
+MockDisplayClient::MockDisplayClient() = default;
 
 MockDisplayClient::~MockDisplayClient() = default;
 
-mojom::DisplayClientPtr MockDisplayClient::BindInterfacePtr() {
-  mojom::DisplayClientPtr ptr;
-  binding_.Bind(MakeRequest(&ptr));
-  return ptr;
+mojo::PendingRemote<mojom::DisplayClient> MockDisplayClient::BindRemote() {
+  return receiver_.BindNewPipeAndPassRemote();
 }
 
 }  // namespace viz

components/viz/test/mock_display_client.h

@@ -7,8 +7,9 @@
 
 #include "build/build_config.h"
 #include "gpu/command_buffer/common/context_result.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/privileged/mojom/compositing/frame_sink_manager.mojom.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
@@ -19,7 +20,7 @@ class MockDisplayClient : public mojom::DisplayClient {
   MockDisplayClient();
   ~MockDisplayClient() override;
 
-  mojom::DisplayClientPtr BindInterfacePtr();
+  mojo::PendingRemote<mojom::DisplayClient> BindRemote();
 
   // mojom::DisplayClient implementation.
 #if defined(OS_MACOSX)
@@ -39,7 +40,7 @@ class MockDisplayClient : public mojom::DisplayClient {
 #endif
 
  private:
-  mojo::Binding<mojom::DisplayClient> binding_;
+  mojo::Receiver<mojom::DisplayClient> receiver_{this};
 
   DISALLOW_COPY_AND_ASSIGN(MockDisplayClient);
 };

content/browser/renderer_host/compositor_impl_android.cc

@@ -829,8 +829,7 @@ void CompositorImpl::InitializeVizLayerTreeFrameSink(
           .InitWithNewPipeAndPassReceiver();
   root_params->display_private = mojo::MakeRequest(&display_private_);
   display_client_ = std::make_unique<AndroidHostDisplayClient>(this);
-  root_params->display_client =
-      display_client_->GetBoundPtr(task_runner).PassInterface();
+  root_params->display_client = display_client_->GetBoundRemote(task_runner);
 
   const auto& display_props =
       display::Screen::GetScreen()->GetDisplayNearestWindow(root_window_);

services/viz/privileged/mojom/compositing/frame_sink_manager.mojom

@@ -37,7 +37,7 @@ struct RootCompositorFrameSinkParams {
   pending_remote<CompositorFrameSinkClient> compositor_frame_sink_client;
 
   associated DisplayPrivate& display_private;
-  DisplayClient display_client;
+  pending_remote<DisplayClient> display_client;
 
   associated ExternalBeginFrameController&? external_begin_frame_controller;
 };

ui/compositor/host/host_context_factory_private.cc

@@ -116,8 +116,7 @@ void HostContextFactoryPrivate::ConfigureCompositor(
   compositor_data.display_client =
       std::make_unique<HostDisplayClient>(compositor);
   root_params->display_client =
-      compositor_data.display_client->GetBoundPtr(resize_task_runner_)
-          .PassInterface();
+      compositor_data.display_client->GetBoundRemote(resize_task_runner_);
 
   if (compositor->use_external_begin_frame_control()) {
     root_params->external_begin_frame_controller =