Convert media::mojom::CdmStorage to new Mojo types

This CL converts media::mojom::CdmStorage from
media/mojo/mojom/cdm_storage.mojom to new Mojo types using
PendingReceiver, Remote, and SelfOwnedReceiver.

Bug: 955171
Change-Id: I07d0d467798b16708eb78964e4d0a1d7fc00ad5c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1903239
Commit-Queue: Julie Kim <jkim@igalia.com>
Reviewed-by: Xiaohan Wang <xhwang@chromium.org>
Reviewed-by: Ken Rockot <rockot@google.com>
Cr-Commit-Position: refs/heads/master@{#714190}

content/browser/media/cdm_storage_impl.cc

@@ -35,9 +35,10 @@
 namespace content {
 
 // static
-void CdmStorageImpl::Create(RenderFrameHost* render_frame_host,
-                            const std::string& cdm_file_system_id,
-                            media::mojom::CdmStorageRequest request) {
+void CdmStorageImpl::Create(
+    RenderFrameHost* render_frame_host,
+    const std::string& cdm_file_system_id,
+    mojo::PendingReceiver<media::mojom::CdmStorage> receiver) {
   DVLOG(3) << __func__;
   DCHECK(!render_frame_host->GetLastCommittedOrigin().opaque())
       << "Invalid origin specified for CdmStorageImpl::Create";
@@ -49,9 +50,9 @@ void CdmStorageImpl::Create(RenderFrameHost* render_frame_host,
   if (storage_partition)
     file_system_context = storage_partition->GetFileSystemContext();
 
-  // The created object is bound to (and owned by) |request|.
+  // The created object is bound to (and owned by) |receiver|.
   new CdmStorageImpl(render_frame_host, cdm_file_system_id,
-                     std::move(file_system_context), std::move(request));
+                     std::move(file_system_context), std::move(receiver));
 }
 
 // static
@@ -75,8 +76,8 @@ CdmStorageImpl::CdmStorageImpl(
     RenderFrameHost* render_frame_host,
     const std::string& cdm_file_system_id,
     scoped_refptr<storage::FileSystemContext> file_system_context,
-    media::mojom::CdmStorageRequest request)
-    : FrameServiceBase(render_frame_host, std::move(request)),
+    mojo::PendingReceiver<media::mojom::CdmStorage> receiver)
+    : FrameServiceBase(render_frame_host, std::move(receiver)),
       cdm_file_system_id_(cdm_file_system_id),
       file_system_context_(std::move(file_system_context)),
       child_process_id_(render_frame_host->GetProcess()->GetID()) {}

content/browser/media/cdm_storage_impl.h

@@ -16,6 +16,7 @@
 #include "content/common/content_export.h"
 #include "content/public/browser/frame_service_base.h"
 #include "media/mojo/mojom/cdm_storage.mojom.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/unique_associated_receiver_set.h"
 
 namespace storage {
@@ -40,7 +41,7 @@ class CONTENT_EXPORT CdmStorageImpl final
   // |request|.
   static void Create(RenderFrameHost* render_frame_host,
                      const std::string& cdm_file_system_id,
-                     media::mojom::CdmStorageRequest request);
+                     mojo::PendingReceiver<media::mojom::CdmStorage> receiver);
 
   // media::mojom::CdmStorage implementation.
   void Open(const std::string& file_name, OpenCallback callback) final;
@@ -54,7 +55,7 @@ class CONTENT_EXPORT CdmStorageImpl final
   CdmStorageImpl(RenderFrameHost* render_frame_host,
                  const std::string& cdm_file_system_id,
                  scoped_refptr<storage::FileSystemContext> file_system_context,
-                 media::mojom::CdmStorageRequest request);
+                 mojo::PendingReceiver<media::mojom::CdmStorage> receiver);
   ~CdmStorageImpl() final;
 
   // Called when the file system is opened.

content/browser/media/cdm_storage_impl_unittest.cc

@@ -16,13 +16,13 @@
 #include "media/mojo/mojom/cdm_storage.mojom.h"
 #include "mojo/public/cpp/bindings/associated_remote.h"
 #include "mojo/public/cpp/bindings/pending_associated_remote.h"
+#include "mojo/public/cpp/bindings/remote.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 
 using media::mojom::CdmFile;
 using media::mojom::CdmStorage;
-using media::mojom::CdmStoragePtr;
 
 namespace content {
 
@@ -92,7 +92,7 @@ class CdmStorageTest : public RenderViewHostTestHarness {
     // Create the CdmStorageImpl object. |cdm_storage_| will own the resulting
     // object.
     CdmStorageImpl::Create(rfh_, file_system_id,
-                           mojo::MakeRequest(&cdm_storage_));
+                           cdm_storage_.BindNewPipeAndPassReceiver());
   }
 
   // Open the file |name|. Returns true if the file returned is valid, false
@@ -209,7 +209,7 @@ class CdmStorageTest : public RenderViewHostTestHarness {
   }
 
   RenderFrameHost* rfh_ = nullptr;
-  CdmStoragePtr cdm_storage_;
+  mojo::Remote<CdmStorage> cdm_storage_;
   std::unique_ptr<RunLoopWithExpectedCount> run_loop_with_count_;
 };
 

media/mojo/services/mojo_cdm_helper_unittest.cc

@@ -11,7 +11,8 @@
 #include "media/cdm/api/content_decryption_module.h"
 #include "media/mojo/mojom/cdm_storage.mojom.h"
 #include "mojo/public/cpp/bindings/associated_receiver.h"
-#include "mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
+#include "mojo/public/cpp/bindings/self_owned_receiver.h"
 #include "services/service_manager/public/cpp/binder_registry.h"
 #include "services/service_manager/public/mojom/interface_provider.mojom.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -65,9 +66,9 @@ class MockCdmStorage : public mojom::CdmStorage {
   mojo::AssociatedReceiver<mojom::CdmFile> client_receiver_{&cdm_file_};
 };
 
-void CreateCdmStorage(mojom::CdmStorageRequest request) {
-  mojo::MakeStrongBinding(std::make_unique<MockCdmStorage>(),
-                          std::move(request));
+void CreateCdmStorage(mojo::PendingReceiver<mojom::CdmStorage> receiver) {
+  mojo::MakeSelfOwnedReceiver(std::make_unique<MockCdmStorage>(),
+                              std::move(receiver));
 }
 
 class TestInterfaceProvider : public service_manager::mojom::InterfaceProvider {