Remove EME Ready event

The event is no longer generated by CDMs and is not part of the spec
anymore.

The prefixed API (old EME v0.1b) still uses the event, so it continues
to be simulated (generated after LoadSession() and AddKey() calls)
for users using that API.

BUG=428384
TEST=existing EME tests pass

Review URL: https://codereview.chromium.org/814063003

Cr-Commit-Position: refs/heads/master@{#309312}

5 files changed, 0 insertions, 17 deletions

diff --git a/media/mojo/interfaces/content_decryption_module.mojom b/media/mojo/interfaces/content_decryption_module.mojom
index 119b1aa..9dbc824 100644
--- a/media/mojo/interfaces/content_decryption_module.mojom
+++ b/media/mojo/interfaces/content_decryption_module.mojom
@@ -93,8 +93,6 @@ interface ContentDecryptionModuleClient {
   OnSessionMessage(string session_id, array<uint8> message,
                    string destination_url);
 
-  OnSessionReady(string session_id);
-
   OnSessionClosed(string session_id);
 
   OnSessionError(string session_id, CdmException exception,
diff --git a/media/mojo/services/mojo_cdm.cc b/media/mojo/services/mojo_cdm.cc
index 5d9a1a9..7822700 100644
--- a/media/mojo/services/mojo_cdm.cc
+++ b/media/mojo/services/mojo_cdm.cc
@@ -32,14 +32,12 @@ static void RejectPromise(scoped_ptr<PromiseType> promise,
 
 MojoCdm::MojoCdm(mojo::ContentDecryptionModulePtr remote_cdm,
                  const SessionMessageCB& session_message_cb,
-                 const SessionReadyCB& session_ready_cb,
                  const SessionClosedCB& session_closed_cb,
                  const SessionErrorCB& session_error_cb,
                  const SessionKeysChangeCB& session_keys_change_cb,
                  const SessionExpirationUpdateCB& session_expiration_update_cb)
     : remote_cdm_(remote_cdm.Pass()),
       session_message_cb_(session_message_cb),
-      session_ready_cb_(session_ready_cb),
       session_closed_cb_(session_closed_cb),
       session_error_cb_(session_error_cb),
       session_keys_change_cb_(session_keys_change_cb),
@@ -47,7 +45,6 @@ MojoCdm::MojoCdm(mojo::ContentDecryptionModulePtr remote_cdm,
       weak_factory_(this) {
   DVLOG(1) << __FUNCTION__;
   DCHECK(!session_message_cb_.is_null());
-  DCHECK(!session_ready_cb_.is_null());
   DCHECK(!session_closed_cb_.is_null());
   DCHECK(!session_error_cb_.is_null());
   DCHECK(!session_keys_change_cb_.is_null());
@@ -131,10 +128,6 @@ void MojoCdm::OnSessionMessage(const mojo::String& session_id,
   session_message_cb_.Run(session_id, message.storage(), verified_gurl);
 }
 
-void MojoCdm::OnSessionReady(const mojo::String& session_id) {
-  session_ready_cb_.Run(session_id);
-}
-
 void MojoCdm::OnSessionClosed(const mojo::String& session_id) {
   session_closed_cb_.Run(session_id);
 }
diff --git a/media/mojo/services/mojo_cdm.h b/media/mojo/services/mojo_cdm.h
index b865cac..1f66b05 100644
--- a/media/mojo/services/mojo_cdm.h
+++ b/media/mojo/services/mojo_cdm.h
@@ -26,7 +26,6 @@ class MojoCdm : public MediaKeys, public mojo::ContentDecryptionModuleClient {
   //     Application that is hosting a mojo::MediaRenderer.
   MojoCdm(mojo::ContentDecryptionModulePtr remote_cdm,
           const SessionMessageCB& session_message_cb,
-          const SessionReadyCB& session_ready_cb,
           const SessionClosedCB& session_closed_cb,
           const SessionErrorCB& session_error_cb,
           const SessionKeysChangeCB& session_keys_change_cb,
@@ -59,7 +58,6 @@ class MojoCdm : public MediaKeys, public mojo::ContentDecryptionModuleClient {
   void OnSessionMessage(const mojo::String& session_id,
                         mojo::Array<uint8_t> message,
                         const mojo::String& destination_url) final;
-  void OnSessionReady(const mojo::String& session_id) final;
   void OnSessionClosed(const mojo::String& session_id) final;
   void OnSessionError(const mojo::String& session_id,
                       mojo::CdmException exception,
@@ -80,7 +78,6 @@ class MojoCdm : public MediaKeys, public mojo::ContentDecryptionModuleClient {
 
   // Callbacks for firing session events.
   SessionMessageCB session_message_cb_;
-  SessionReadyCB session_ready_cb_;
   SessionClosedCB session_closed_cb_;
   SessionErrorCB session_error_cb_;
   SessionKeysChangeCB session_keys_change_cb_;
diff --git a/media/mojo/services/mojo_cdm_service.cc b/media/mojo/services/mojo_cdm_service.cc
index eeada5d..8b6673b 100644
--- a/media/mojo/services/mojo_cdm_service.cc
+++ b/media/mojo/services/mojo_cdm_service.cc
@@ -122,10 +122,6 @@ void MojoCdmService::OnSessionExpirationUpdate(
                                       new_expiry_time.ToInternalValue());
 }
 
-void MojoCdmService::OnSessionReady(const std::string& session_id) {
-  client()->OnSessionReady(session_id);
-}
-
 void MojoCdmService::OnSessionClosed(const std::string& session_id) {
   client()->OnSessionClosed(session_id);
 }
diff --git a/media/mojo/services/mojo_cdm_service.h b/media/mojo/services/mojo_cdm_service.h
index 24db817..7bb7869 100644
--- a/media/mojo/services/mojo_cdm_service.h
+++ b/media/mojo/services/mojo_cdm_service.h
@@ -56,7 +56,6 @@ class MojoCdmService
                            bool has_additional_usable_key);
   void OnSessionExpirationUpdate(const std::string& session_id,
                                  const base::Time& new_expiry_time);
-  void OnSessionReady(const std::string& session_id);
   void OnSessionClosed(const std::string& session_id);
   void OnSessionError(const std::string& session_id,
                       MediaKeys::Exception exception,