Clean up old Mojo type for mojom::ExternalBeginFrameController

This CL cleans up old mojo types for
mojom::ExternalBeginFrameController using AssociatedRemote,
PendingAssociatedReceiver, and AssociatedReceiver.

Bug: 955171
Change-Id: I1c8c2669f9f18420db0d6960d662598708d93248
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1897376Reviewed-by: Oksana Zhuravlova <oksamyt@chromium.org>
Reviewed-by: kylechar <kylechar@chromium.org>
Reviewed-by: enne <enne@chromium.org>
Commit-Queue: Julie Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#714806}

components/viz/service/compositor_frame_fuzzer/fuzzer_browser_process.cc

@@ -106,8 +106,8 @@ FuzzerBrowserProcess::BuildRootCompositorFrameSinkParams() {
       display_private_.BindNewEndpointAndPassDedicatedReceiverForTesting();
   params->display_client = display_client_.BindRemote();
   params->external_begin_frame_controller =
-      MakeRequestAssociatedWithDedicatedPipe(
-          &external_begin_frame_controller_ptr_);
+      external_begin_frame_controller_remote_
+           .BindNewEndpointAndPassDedicatedReceiverForTesting();
   return params;
 }
 

components/viz/service/compositor_frame_fuzzer/fuzzer_browser_process.h

@@ -55,8 +55,8 @@ class FuzzerBrowserProcess {
   FakeCompositorFrameSinkClient root_compositor_frame_sink_client_;
   mojo::AssociatedRemote<mojom::DisplayPrivate> display_private_;
   FakeDisplayClient display_client_;
-  mojom::ExternalBeginFrameControllerAssociatedPtr
-      external_begin_frame_controller_ptr_;
+  mojo::AssociatedRemote<mojom::ExternalBeginFrameController>
+      external_begin_frame_controller_remote_;
 
   ParentLocalSurfaceIdAllocator lsi_allocator_;
 

components/viz/service/frame_sinks/external_begin_frame_source_mojo.cc

@@ -10,11 +10,12 @@ namespace viz {
 
 ExternalBeginFrameSourceMojo::ExternalBeginFrameSourceMojo(
     FrameSinkManagerImpl* frame_sink_manager,
-    mojom::ExternalBeginFrameControllerAssociatedRequest controller_request,
+    mojo::PendingAssociatedReceiver<mojom::ExternalBeginFrameController>
+        controller_receiver,
     uint32_t restart_id)
     : ExternalBeginFrameSource(this, restart_id),
       frame_sink_manager_(frame_sink_manager),
-      binding_(this, std::move(controller_request)) {
+      receiver_(this, std::move(controller_receiver)) {
   frame_sink_manager_->AddObserver(this);
 }
 

components/viz/service/frame_sinks/external_begin_frame_source_mojo.h

@@ -12,7 +12,8 @@
 #include "components/viz/common/frame_sinks/begin_frame_source.h"
 #include "components/viz/service/display/display.h"
 #include "components/viz/service/frame_sinks/frame_sink_observer.h"
-#include "mojo/public/cpp/bindings/associated_binding.h"
+#include "mojo/public/cpp/bindings/associated_receiver.h"
+#include "mojo/public/cpp/bindings/pending_associated_receiver.h"
 #include "services/viz/privileged/mojom/compositing/external_begin_frame_controller.mojom.h"
 
 namespace viz {
@@ -32,7 +33,8 @@ class VIZ_SERVICE_EXPORT ExternalBeginFrameSourceMojo
  public:
   ExternalBeginFrameSourceMojo(
       FrameSinkManagerImpl* frame_sink_manager,
-      mojom::ExternalBeginFrameControllerAssociatedRequest controller_request,
+      mojo::PendingAssociatedReceiver<mojom::ExternalBeginFrameController>
+          controller_receiver,
       uint32_t restart_id);
   ~ExternalBeginFrameSourceMojo() override;
 
@@ -74,7 +76,7 @@ class VIZ_SERVICE_EXPORT ExternalBeginFrameSourceMojo
 
   FrameSinkManagerImpl* const frame_sink_manager_;
 
-  mojo::AssociatedBinding<mojom::ExternalBeginFrameController> binding_;
+  mojo::AssociatedReceiver<mojom::ExternalBeginFrameController> receiver_;
   base::OnceCallback<void(const BeginFrameAck& ack)> pending_frame_callback_;
   // The frame source id as specified in BeginFrameArgs passed to
   // IssueExternalBeginFrame. Note this is likely to be different from our

content/browser/compositor/gpu_process_transport_factory.cc

@@ -63,6 +63,7 @@
 #include "gpu/ipc/client/gpu_channel_host.h"
 #include "gpu/ipc/host/gpu_memory_buffer_support.h"
 #include "gpu/vulkan/buildflags.h"
+#include "mojo/public/cpp/bindings/pending_associated_receiver.h"
 #include "services/viz/public/cpp/gpu/context_provider_command_buffer.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "ui/base/ui_base_switches_util.h"
@@ -424,11 +425,10 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
   if (compositor->use_external_begin_frame_control()) {
     // We don't bind the controller mojo interface, since we only use the
     // ExternalBeginFrameSourceMojo directly and not via mojo (plus, as it
-    // is an associated interface, binding it would require a separate pipe).
-    viz::mojom::ExternalBeginFrameControllerAssociatedRequest request = nullptr;
+    // is an associated remote, binding it would require a separate pipe).
     external_begin_frame_source_mojo =
         std::make_unique<viz::ExternalBeginFrameSourceMojo>(
-            GetFrameSinkManager(), std::move(request),
+            GetFrameSinkManager(), mojo::NullAssociatedReceiver(),
             viz::BeginFrameSource::kNotRestartableId);
     begin_frame_source = external_begin_frame_source_mojo.get();
   } else if (disable_frame_rate_limit_) {

ui/compositor/host/host_context_factory_private.cc

@@ -121,7 +121,8 @@ void HostContextFactoryPrivate::ConfigureCompositor(
 
   if (compositor->use_external_begin_frame_control()) {
     root_params->external_begin_frame_controller =
-        mojo::MakeRequest(&compositor_data.external_begin_frame_controller);
+        compositor_data.external_begin_frame_controller
+            .BindNewEndpointAndPassReceiver();
   }
 
   root_params->frame_sink_id = compositor->frame_sink_id();

ui/compositor/host/host_context_factory_private.h

@@ -107,7 +107,7 @@ class HostContextFactoryPrivate : public ContextFactoryPrivate {
     // CompositorFrameSink.
     mojo::AssociatedRemote<viz::mojom::DisplayPrivate> display_private;
     std::unique_ptr<viz::HostDisplayClient> display_client;
-    viz::mojom::ExternalBeginFrameControllerAssociatedPtr
+    mojo::AssociatedRemote<viz::mojom::ExternalBeginFrameController>
         external_begin_frame_controller;
 
     std::unique_ptr<PendingBeginFrameArgs> pending_begin_frame_args;