Clean up old Mojo type for mojom::FrameResourceReleaser

This CL cleans up old mojo types for mojom::FrameResourceReleaser
with using PendingRemote and MakeSelfOwnedReceiver.

Bug: 955171
Change-Id: I6387a0e48434b7a765ad9867eb7f1655d36755fe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1928595Reviewed-by: John Rummell <jrummell@chromium.org>
Reviewed-by: Oksana Zhuravlova <oksamyt@chromium.org>
Reviewed-by: Sam McNally <sammc@chromium.org>
Commit-Queue: Julie Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#718018}

media/mojo/clients/mojo_decryptor.cc

@@ -25,7 +25,8 @@ namespace media {
 
 namespace {
 
-void ReleaseFrameResource(mojom::FrameResourceReleaserPtr releaser) {
+void ReleaseFrameResource(
+    mojo::PendingRemote<mojom::FrameResourceReleaser> releaser) {
   // Close the connection, which will result in the service realizing the frame
   // resource is no longer needed.
   releaser.reset();
@@ -263,10 +264,11 @@ void MojoDecryptor::OnAudioDecoded(
   std::move(audio_decode_cb).Run(status, audio_frames);
 }
 
-void MojoDecryptor::OnVideoDecoded(VideoDecodeOnceCB video_decode_cb,
-                                   Status status,
-                                   const scoped_refptr<VideoFrame>& video_frame,
-                                   mojom::FrameResourceReleaserPtr releaser) {
+void MojoDecryptor::OnVideoDecoded(
+    VideoDecodeOnceCB video_decode_cb,
+    Status status,
+    const scoped_refptr<VideoFrame>& video_frame,
+    mojo::PendingRemote<mojom::FrameResourceReleaser> releaser) {
   DVLOG_IF(1, status != kSuccess) << __func__ << ": status = " << status;
   DVLOG_IF(3, status == kSuccess) << __func__;
   DCHECK(thread_checker_.CalledOnValidThread());

media/mojo/clients/mojo_decryptor.h

@@ -13,7 +13,6 @@
 #include "base/threading/thread_checker.h"
 #include "media/base/decryptor.h"
 #include "media/mojo/mojom/decryptor.mojom.h"
-#include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/remote.h"
 
@@ -78,10 +77,11 @@ class MojoDecryptor : public Decryptor {
   void OnAudioDecoded(AudioDecodeOnceCB audio_decode_cb,
                       Status status,
                       std::vector<mojom::AudioBufferPtr> audio_buffers);
-  void OnVideoDecoded(VideoDecodeOnceCB video_decode_cb,
-                      Status status,
-                      const scoped_refptr<VideoFrame>& video_frame,
-                      mojom::FrameResourceReleaserPtr releaser);
+  void OnVideoDecoded(
+      VideoDecodeOnceCB video_decode_cb,
+      Status status,
+      const scoped_refptr<VideoFrame>& video_frame,
+      mojo::PendingRemote<mojom::FrameResourceReleaser> releaser);
 
   void OnConnectionError(uint32_t custom_reason,
                          const std::string& description);

media/mojo/mojom/decryptor.mojom

@@ -57,7 +57,9 @@ interface Decryptor {
   DecryptAndDecodeAudio(DecoderBuffer encrypted)
       => (Status status, array<AudioBuffer> audio_buffers);
   DecryptAndDecodeVideo(DecoderBuffer encrypted)
-      => (Status status, VideoFrame? video_frame, FrameResourceReleaser? releaser);
+      => (Status status,
+          VideoFrame? video_frame,
+          pending_remote<FrameResourceReleaser>? releaser);
 
   // Resets the decoder for |stream_type| to a clean initialized state and
   // cancels any pending decrypt-and-decode operations immediately with ERROR.

media/mojo/services/mojo_decryptor_service.cc

@@ -19,7 +19,8 @@
 #include "media/mojo/common/mojo_shared_buffer_video_frame.h"
 #include "media/mojo/mojom/demuxer_stream.mojom.h"
 #include "media/mojo/services/mojo_cdm_service_context.h"
-#include "mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/public/cpp/bindings/pending_remote.h"
+#include "mojo/public/cpp/bindings/self_owned_receiver.h"
 
 namespace media {
 
@@ -238,7 +239,7 @@ void MojoDecryptorService::OnAudioRead(DecryptAndDecodeAudioCallback callback,
 void MojoDecryptorService::OnVideoRead(DecryptAndDecodeVideoCallback callback,
                                        scoped_refptr<DecoderBuffer> buffer) {
   if (!buffer) {
-    std::move(callback).Run(Status::kError, nullptr, nullptr);
+    std::move(callback).Run(Status::kError, nullptr, mojo::NullRemote());
     return;
   }
 
@@ -278,16 +279,17 @@ void MojoDecryptorService::OnVideoDecoded(
 
   if (!frame) {
     DCHECK_NE(status, Status::kSuccess);
-    std::move(callback).Run(status, nullptr, nullptr);
+    std::move(callback).Run(status, nullptr, mojo::NullRemote());
     return;
   }
 
   // If |frame| has shared memory that will be passed back, keep the reference
   // to it until the other side is done with the memory.
-  mojom::FrameResourceReleaserPtr releaser;
+  mojo::PendingRemote<mojom::FrameResourceReleaser> releaser;
   if (frame->storage_type() == VideoFrame::STORAGE_MOJO_SHARED_BUFFER) {
-    mojo::MakeStrongBinding(std::make_unique<FrameResourceReleaserImpl>(frame),
-                            mojo::MakeRequest(&releaser));
+    mojo::MakeSelfOwnedReceiver(
+        std::make_unique<FrameResourceReleaserImpl>(frame),
+        releaser.InitWithNewPipeAndPassReceiver());
   }
 
   std::move(callback).Run(status, std::move(frame), std::move(releaser));