Convert mojom::ContentDecryptionModulePtr to new Mojo type

This CL converts |remote_cdm_| member variable to mojo::Remote
in MojoCdm class. As the change, this CL also converts related
things as well.

  - Convert mojo::StrongBindingSet to mojo::UniqueReceiverSet

TBR=xhwang@chromium.org

Bug: 955171
Change-Id: Id8f8e13fab7658ec6a94187febf9fcdad342340c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1841596Reviewed-by: Oksana Zhuravlova <oksamyt@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
Cr-Commit-Position: refs/heads/master@{#705902}

media/mojo/clients/mojo_cdm.cc

@@ -41,7 +41,7 @@ void MojoCdm::Create(
     const std::string& key_system,
     const url::Origin& security_origin,
     const CdmConfig& cdm_config,
-    mojom::ContentDecryptionModulePtr remote_cdm,
+    mojo::PendingRemote<mojom::ContentDecryptionModule> remote_cdm,
     mojom::InterfaceFactory* interface_factory,
     const SessionMessageCB& session_message_cb,
     const SessionClosedCB& session_closed_cb,
@@ -60,7 +60,7 @@ void MojoCdm::Create(
                           std::move(promise));
 }
 
-MojoCdm::MojoCdm(mojom::ContentDecryptionModulePtr remote_cdm,
+MojoCdm::MojoCdm(mojo::PendingRemote<mojom::ContentDecryptionModule> remote_cdm,
                  mojom::InterfaceFactory* interface_factory,
                  const SessionMessageCB& session_message_cb,
                  const SessionClosedCB& session_closed_cb,
@@ -116,7 +116,7 @@ void MojoCdm::InitializeCdm(const std::string& key_system,
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
 
   // If connection error has happened, fail immediately.
-  if (remote_cdm_.encountered_error()) {
+  if (!remote_cdm_.is_connected()) {
     LOG(ERROR) << "Remote CDM encountered error.";
     promise->reject(CdmPromise::Exception::INVALID_STATE_ERROR, 0,
                     "Mojo CDM creation failed.");
@@ -127,7 +127,7 @@ void MojoCdm::InitializeCdm(const std::string& key_system,
   RecordConnectionError(false);
 
   // Otherwise, set an error handler to catch the connection error.
-  remote_cdm_.set_connection_error_with_reason_handler(
+  remote_cdm_.set_disconnect_with_reason_handler(
       base::Bind(&MojoCdm::OnConnectionError, base::Unretained(this)));
 
   pending_init_promise_ = std::move(promise);

media/mojo/clients/mojo_cdm.h

@@ -23,6 +23,8 @@
 #include "media/mojo/mojom/content_decryption_module.mojom.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/pending_remote.h"
+#include "mojo/public/cpp/bindings/remote.h"
 
 namespace base {
 class SingleThreadTaskRunner;
@@ -53,7 +55,7 @@ class MojoCdm : public ContentDecryptionModule,
       const std::string& key_system,
       const url::Origin& security_origin,
       const CdmConfig& cdm_config,
-      mojom::ContentDecryptionModulePtr remote_cdm,
+      mojo::PendingRemote<mojom::ContentDecryptionModule> remote_cdm,
       mojom::InterfaceFactory* interface_factory,
       const SessionMessageCB& session_message_cb,
       const SessionClosedCB& session_closed_cb,
@@ -89,7 +91,7 @@ class MojoCdm : public ContentDecryptionModule,
   int GetCdmId() const final;
 
  private:
-  MojoCdm(mojom::ContentDecryptionModulePtr remote_cdm,
+  MojoCdm(mojo::PendingRemote<mojom::ContentDecryptionModule> remote_cdm,
           mojom::InterfaceFactory* interface_factory,
           const SessionMessageCB& session_message_cb,
           const SessionClosedCB& session_closed_cb,
@@ -138,7 +140,7 @@ class MojoCdm : public ContentDecryptionModule,
 
   THREAD_CHECKER(thread_checker_);
 
-  mojom::ContentDecryptionModulePtr remote_cdm_;
+  mojo::Remote<mojom::ContentDecryptionModule> remote_cdm_;
   mojom::InterfaceFactory* interface_factory_;
   mojo::AssociatedBinding<ContentDecryptionModuleClient> client_binding_;
 

media/mojo/clients/mojo_cdm_factory.cc

@@ -58,13 +58,14 @@ void MojoCdmFactory::Create(
     return;
   }
 
-  mojom::ContentDecryptionModulePtr cdm_ptr;
-  interface_factory_->CreateCdm(key_system, mojo::MakeRequest(&cdm_ptr));
+  mojo::PendingRemote<mojom::ContentDecryptionModule> cdm_pending_remote;
+  interface_factory_->CreateCdm(
+      key_system, cdm_pending_remote.InitWithNewPipeAndPassReceiver());
 
-  MojoCdm::Create(key_system, security_origin, cdm_config, std::move(cdm_ptr),
-                  interface_factory_, session_message_cb, session_closed_cb,
-                  session_keys_change_cb, session_expiration_update_cb,
-                  cdm_created_cb);
+  MojoCdm::Create(key_system, security_origin, cdm_config,
+                  std::move(cdm_pending_remote), interface_factory_,
+                  session_message_cb, session_closed_cb, session_keys_change_cb,
+                  session_expiration_update_cb, cdm_created_cb);
 }
 
 }  // namespace media

media/mojo/clients/mojo_cdm_unittest.cc

@@ -21,6 +21,7 @@
 #include "media/mojo/services/mojo_cdm_service.h"
 #include "media/mojo/services/mojo_cdm_service_context.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/public/cpp/bindings/pending_remote.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 #include "url/origin.h"
@@ -80,10 +81,9 @@ class MojoCdmTest : public ::testing::Test {
     // TODO(xhwang): Add pending init support.
     DCHECK_NE(PENDING, expected_result);
 
-    mojom::ContentDecryptionModulePtr remote_cdm;
-    auto cdm_request = mojo::MakeRequest(&remote_cdm);
+    mojo::PendingRemote<mojom::ContentDecryptionModule> remote_cdm;
 
-    cdm_binding_.Bind(std::move(cdm_request));
+    cdm_binding_.Bind(remote_cdm.InitWithNewPipeAndPassReceiver());
 
     std::string key_system;
     if (expected_result == CONNECTION_ERROR_BEFORE) {

media/mojo/services/cdm_service.cc

@@ -103,7 +103,7 @@ class CdmFactoryImpl : public DeferredDestroy<mojom::CdmFactory> {
       std::move(destroy_cb_).Run();
   }
 
-  // Must be declared before the bindings below because the bound objects might
+  // Must be declared before the receivers below because the bound objects might
   // take a raw pointer of |cdm_service_context_| and assume it's always
   // available.
   MojoCdmServiceContext cdm_service_context_;