Clean up old Mojo types for mojom::VideoEncodeAcceleratorProvider

This CL cleans up old Mojo types for
mojom::VideoEncodeAcceleratorProvider using PendingRemote instead of
InterfacePtr and InterfacePtrInfo.

Bug: 955171
Change-Id: Ib2e251f4b690c8b25634da89f586331d7f72d20c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1939134Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Yuri Wiitala <miu@chromium.org>
Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#720497}

components/mirroring/service/session.cc

@@ -545,7 +545,7 @@ void Session::CreateVideoEncodeAccelerator(
   if (gpu_ && gpu_channel_host_ && !supported_profiles_.empty()) {
     if (!vea_provider_) {
       gpu_->CreateVideoEncodeAcceleratorProvider(
-          mojo::MakeRequest(&vea_provider_));
+          vea_provider_.BindNewPipeAndPassReceiver());
     }
     mojo::PendingRemote<media::mojom::VideoEncodeAccelerator> vea;
     vea_provider_->CreateVideoEncodeAccelerator(

components/mirroring/service/session.h

@@ -181,7 +181,7 @@ class COMPONENT_EXPORT(MIRRORING_SERVICE) Session final
   std::unique_ptr<viz::Gpu> gpu_;
   scoped_refptr<gpu::GpuChannelHost> gpu_channel_host_;
   gpu::VideoEncodeAcceleratorSupportedProfiles supported_profiles_;
-  media::mojom::VideoEncodeAcceleratorProviderPtr vea_provider_;
+  mojo::Remote<media::mojom::VideoEncodeAcceleratorProvider> vea_provider_;
 
   base::WeakPtrFactory<Session> weak_factory_{this};
 };

content/renderer/media/gpu/gpu_video_accelerator_factories_impl.cc

@@ -31,7 +31,6 @@
 #include "media/mojo/clients/mojo_video_encode_accelerator.h"
 #include "media/video/video_encode_accelerator.h"
 #include "mojo/public/cpp/base/shared_memory_utils.h"
-#include "mojo/public/cpp/bindings/pending_remote.h"
 #include "services/viz/public/cpp/gpu/context_provider_command_buffer.h"
 #include "third_party/skia/include/core/SkPostConfig.h"
 
@@ -65,14 +64,15 @@ GpuVideoAcceleratorFactoriesImpl::Create(
     bool enable_video_accelerator,
     mojo::PendingRemote<media::mojom::InterfaceFactory>
         interface_factory_remote,
-    media::mojom::VideoEncodeAcceleratorProviderPtrInfo vea_provider_info) {
+    mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider>
+        vea_provider_remote) {
   RecordContextProviderPhaseUmaEnum(
       ContextProviderPhase::CONTEXT_PROVIDER_ACQUIRED);
   return base::WrapUnique(new GpuVideoAcceleratorFactoriesImpl(
       std::move(gpu_channel_host), main_thread_task_runner, task_runner,
       context_provider, enable_video_gpu_memory_buffers,
       enable_media_stream_gpu_memory_buffers, enable_video_accelerator,
-      std::move(interface_factory_remote), std::move(vea_provider_info)));
+      std::move(interface_factory_remote), std::move(vea_provider_remote)));
 }
 
 GpuVideoAcceleratorFactoriesImpl::GpuVideoAcceleratorFactoriesImpl(
@@ -85,7 +85,8 @@ GpuVideoAcceleratorFactoriesImpl::GpuVideoAcceleratorFactoriesImpl(
     bool enable_video_accelerator,
     mojo::PendingRemote<media::mojom::InterfaceFactory>
         interface_factory_remote,
-    media::mojom::VideoEncodeAcceleratorProviderPtrInfo vea_provider_info)
+    mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider>
+        vea_provider_remote)
     : main_thread_task_runner_(main_thread_task_runner),
       task_runner_(task_runner),
       gpu_channel_host_(std::move(gpu_channel_host)),
@@ -105,7 +106,7 @@ GpuVideoAcceleratorFactoriesImpl::GpuVideoAcceleratorFactoriesImpl(
       base::BindOnce(&GpuVideoAcceleratorFactoriesImpl::BindOnTaskRunner,
                      base::Unretained(this),
                      std::move(interface_factory_remote),
-                     std::move(vea_provider_info)));
+                     std::move(vea_provider_remote)));
 }
 
 GpuVideoAcceleratorFactoriesImpl::~GpuVideoAcceleratorFactoriesImpl() {}
@@ -113,12 +114,13 @@ GpuVideoAcceleratorFactoriesImpl::~GpuVideoAcceleratorFactoriesImpl() {}
 void GpuVideoAcceleratorFactoriesImpl::BindOnTaskRunner(
     mojo::PendingRemote<media::mojom::InterfaceFactory>
         interface_factory_remote,
-    media::mojom::VideoEncodeAcceleratorProviderPtrInfo vea_provider_info) {
+    mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider>
+        vea_provider_remote) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(context_provider_);
 
   interface_factory_.Bind(std::move(interface_factory_remote));
-  vea_provider_.Bind(std::move(vea_provider_info));
+  vea_provider_.Bind(std::move(vea_provider_remote));
 
   if (context_provider_->BindToCurrentThread() !=
       gpu::ContextResult::kSuccess) {

content/renderer/media/gpu/gpu_video_accelerator_factories_impl.h

@@ -27,6 +27,7 @@
 #include "media/mojo/mojom/video_encode_accelerator.mojom.h"
 #include "media/video/gpu_video_accelerator_factories.h"
 #include "media/video/supported_video_decoder_config.h"
+#include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "ui/gfx/geometry/size.h"
 
@@ -68,7 +69,8 @@ class CONTENT_EXPORT GpuVideoAcceleratorFactoriesImpl
       bool enable_video_accelerator,
       mojo::PendingRemote<media::mojom::InterfaceFactory>
           interface_factory_remote,
-      media::mojom::VideoEncodeAcceleratorProviderPtrInfo vea_provider_info);
+      mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider>
+          vea_provider_remote);
 
   // media::GpuVideoAcceleratorFactories implementation.
   bool IsGpuVideoAcceleratorEnabled() override;
@@ -137,12 +139,14 @@ class CONTENT_EXPORT GpuVideoAcceleratorFactoriesImpl
       bool enable_video_accelerator,
       mojo::PendingRemote<media::mojom::InterfaceFactory>
           interface_factory_remote,
-      media::mojom::VideoEncodeAcceleratorProviderPtrInfo vea_provider_info);
+      mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider>
+          vea_provider_remote);
 
   void BindOnTaskRunner(
       mojo::PendingRemote<media::mojom::InterfaceFactory>
           interface_factory_remote,
-      media::mojom::VideoEncodeAcceleratorProviderPtrInfo vea_provider_info);
+      mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider>
+          vea_provider_remote);
 
   // viz::ContextLostObserver implementation.
   void OnContextLost() override;
@@ -178,7 +182,7 @@ class CONTENT_EXPORT GpuVideoAcceleratorFactoriesImpl
   gpu::GpuMemoryBufferManager* const gpu_memory_buffer_manager_;
 
   mojo::Remote<media::mojom::InterfaceFactory> interface_factory_;
-  media::mojom::VideoEncodeAcceleratorProviderPtr vea_provider_;
+  mojo::Remote<media::mojom::VideoEncodeAcceleratorProvider> vea_provider_;
 
   // SupportedDecoderConfigs state.
   mojo::Remote<media::mojom::VideoDecoder> video_decoder_;

content/renderer/render_thread_impl.cc

@@ -113,9 +113,6 @@
 #include "media/media_buildflags.h"
 #include "media/video/gpu_video_accelerator_factories.h"
 #include "mojo/public/cpp/bindings/binder_map.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 "mojo/public/cpp/bindings/self_owned_receiver.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 #include "net/base/net_errors.h"
@@ -1149,15 +1146,17 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl::GetGpuFactories() {
   mojo::PendingRemote<media::mojom::InterfaceFactory> interface_factory;
   BindHostReceiver(interface_factory.InitWithNewPipeAndPassReceiver());
 
-  media::mojom::VideoEncodeAcceleratorProviderPtr vea_provider;
-  gpu_->CreateVideoEncodeAcceleratorProvider(mojo::MakeRequest(&vea_provider));
+  mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider>
+      vea_provider;
+  gpu_->CreateVideoEncodeAcceleratorProvider(
+      vea_provider.InitWithNewPipeAndPassReceiver());
 
   gpu_factories_.push_back(GpuVideoAcceleratorFactoriesImpl::Create(
       std::move(gpu_channel_host), base::ThreadTaskRunnerHandle::Get(),
       GetMediaThreadTaskRunner(), std::move(media_context_provider),
       enable_video_gpu_memory_buffers, enable_media_stream_gpu_memory_buffers,
       enable_video_accelerator, std::move(interface_factory),
-      vea_provider.PassInterface()));
+      std::move(vea_provider)));
   gpu_factories_.back()->SetRenderingColorSpace(rendering_color_space_);
   return gpu_factories_.back().get();
 }