| Index: content/renderer/media/cdm/proxy_media_keys.cc
|
| diff --git a/content/renderer/media/cdm/proxy_media_keys.cc b/content/renderer/media/cdm/proxy_media_keys.cc
|
| index a1299eac3d11ea8651880fe3355d029873fc75f1..2fd6c42fc6971ccb373525554e14cbcfc3865bff 100644
|
| --- a/content/renderer/media/cdm/proxy_media_keys.cc
|
| +++ b/content/renderer/media/cdm/proxy_media_keys.cc
|
| @@ -23,14 +23,13 @@ void ProxyMediaKeys::Create(
|
| RendererCdmManager* manager,
|
| const media::SessionMessageCB& session_message_cb,
|
| const media::SessionClosedCB& session_closed_cb,
|
| - const media::LegacySessionErrorCB& legacy_session_error_cb,
|
| const media::SessionKeysChangeCB& session_keys_change_cb,
|
| const media::SessionExpirationUpdateCB& session_expiration_update_cb,
|
| const media::CdmCreatedCB& cdm_created_cb) {
|
| DCHECK(manager);
|
| - scoped_refptr<ProxyMediaKeys> proxy_media_keys(new ProxyMediaKeys(
|
| - manager, session_message_cb, session_closed_cb, legacy_session_error_cb,
|
| - session_keys_change_cb, session_expiration_update_cb));
|
| + scoped_refptr<ProxyMediaKeys> proxy_media_keys(
|
| + new ProxyMediaKeys(manager, session_message_cb, session_closed_cb,
|
| + session_keys_change_cb, session_expiration_update_cb));
|
|
|
| // ProxyMediaKeys ownership passed to the promise.
|
| std::unique_ptr<media::CdmInitializedPromise> promise(
|
| @@ -120,24 +119,14 @@ int ProxyMediaKeys::GetCdmId() const {
|
| void ProxyMediaKeys::OnSessionMessage(
|
| const std::string& session_id,
|
| media::MediaKeys::MessageType message_type,
|
| - const std::vector<uint8_t>& message,
|
| - const GURL& legacy_destination_url) {
|
| - session_message_cb_.Run(session_id, message_type, message,
|
| - legacy_destination_url);
|
| + const std::vector<uint8_t>& message) {
|
| + session_message_cb_.Run(session_id, message_type, message);
|
| }
|
|
|
| void ProxyMediaKeys::OnSessionClosed(const std::string& session_id) {
|
| session_closed_cb_.Run(session_id);
|
| }
|
|
|
| -void ProxyMediaKeys::OnLegacySessionError(const std::string& session_id,
|
| - media::MediaKeys::Exception exception,
|
| - uint32_t system_code,
|
| - const std::string& error_message) {
|
| - legacy_session_error_cb_.Run(session_id, exception, system_code,
|
| - error_message);
|
| -}
|
| -
|
| void ProxyMediaKeys::OnSessionKeysChange(const std::string& session_id,
|
| bool has_additional_usable_key,
|
| media::CdmKeysInfo keys_info) {
|
| @@ -173,13 +162,11 @@ ProxyMediaKeys::ProxyMediaKeys(
|
| RendererCdmManager* manager,
|
| const media::SessionMessageCB& session_message_cb,
|
| const media::SessionClosedCB& session_closed_cb,
|
| - const media::LegacySessionErrorCB& legacy_session_error_cb,
|
| const media::SessionKeysChangeCB& session_keys_change_cb,
|
| const media::SessionExpirationUpdateCB& session_expiration_update_cb)
|
| : manager_(manager),
|
| session_message_cb_(session_message_cb),
|
| session_closed_cb_(session_closed_cb),
|
| - legacy_session_error_cb_(legacy_session_error_cb),
|
| session_keys_change_cb_(session_keys_change_cb),
|
| session_expiration_update_cb_(session_expiration_update_cb) {
|
| cdm_id_ = manager->RegisterMediaKeys(this);
|
|
|