EME: Close existing sessions on CDM failure

media/mojo/clients/mojo_cdm.h

Index: media/mojo/clients/mojo_cdm.h
diff --git a/media/mojo/clients/mojo_cdm.h b/media/mojo/clients/mojo_cdm.h
index e9578654d7e2725342177b823cf0561f38f124b9..6582c1cf1dbfb7f4baa62a25cc15a06d828bf590 100644
--- a/media/mojo/clients/mojo_cdm.h
+++ b/media/mojo/clients/mojo_cdm.h
@@ -17,6 +17,7 @@
 #include "base/threading/thread_checker.h"
 #include "media/base/cdm_context.h"
 #include "media/base/cdm_initialized_promise.h"
+#include "media/base/cdm_session_tracker.h"
 #include "media/base/media_keys.h"
 #include "media/mojo/interfaces/content_decryption_module.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
@@ -39,13 +40,13 @@ class MojoCdm : public MediaKeys,
   static void Create(
       const std::string& key_system,
       const GURL& security_origin,
-      const media::CdmConfig& cdm_config,
+      const CdmConfig& cdm_config,
       mojom::ContentDecryptionModulePtr remote_cdm,
-      const media::SessionMessageCB& session_message_cb,
-      const media::SessionClosedCB& session_closed_cb,
-      const media::SessionKeysChangeCB& session_keys_change_cb,
-      const media::SessionExpirationUpdateCB& session_expiration_update_cb,
-      const media::CdmCreatedCB& cdm_created_cb);
+      const SessionMessageCB& session_message_cb,
+      const SessionClosedCB& session_closed_cb,
+      const SessionKeysChangeCB& session_keys_change_cb,
+      const SessionExpirationUpdateCB& session_expiration_update_cb,
+      const CdmCreatedCB& cdm_created_cb);
 
   // MediaKeys implementation.
   void SetServerCertificate(const std::vector<uint8_t>& certificate,
@@ -69,7 +70,7 @@ class MojoCdm : public MediaKeys,
 
   // CdmContext implementation. Can be called on a different thread.
   // All GetDecryptor() calls must be made on the same thread.
-  media::Decryptor* GetDecryptor() final;
+  Decryptor* GetDecryptor() final;
   int GetCdmId() const final;
 
  private:
@@ -83,7 +84,7 @@ class MojoCdm : public MediaKeys,
 
   void InitializeCdm(const std::string& key_system,
                      const GURL& security_origin,
-                     const media::CdmConfig& cdm_config,
+                     const CdmConfig& cdm_config,
                      std::unique_ptr<CdmInitializedPromise> promise);
 
   void OnConnectionError();
@@ -150,6 +151,9 @@ class MojoCdm : public MediaKeys,
   // Pending promise for InitializeCdm().
   std::unique_ptr<CdmInitializedPromise> pending_init_promise_;
 
+  // Keep track of current sessions.
+  CdmSessionTracker cdm_session_tracker_;
+
   // This must be the last member.
   base::WeakPtrFactory<MojoCdm> weak_factory_;