Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(229)

Unified Diff: media/mojo/services/mojo_cdm_service.cc

Issue 2255943002: EME: Remove obsolete legacy APIs related to versions of prefixed EME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build and add bug reference for obsoletes Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/mojo/services/mojo_cdm_service.cc
diff --git a/media/mojo/services/mojo_cdm_service.cc b/media/mojo/services/mojo_cdm_service.cc
index 11db7d18ed36e577484c78ca82b007c1fb3fe927..bae6db718a9833e43150c51efa3a9664c707211f 100644
--- a/media/mojo/services/mojo_cdm_service.cc
+++ b/media/mojo/services/mojo_cdm_service.cc
@@ -116,7 +116,6 @@ void MojoCdmService::Initialize(const mojo::String& key_system,
key_system, GURL(security_origin.get()), cdm_config.To<CdmConfig>(),
base::Bind(&MojoCdmService::OnSessionMessage, weak_this),
base::Bind(&MojoCdmService::OnSessionClosed, weak_this),
- base::Bind(&MojoCdmService::OnLegacySessionError, weak_this),
base::Bind(&MojoCdmService::OnSessionKeysChange, weak_this),
base::Bind(&MojoCdmService::OnSessionExpirationUpdate, weak_this),
base::Bind(&MojoCdmService::OnCdmCreated, weak_this, callback));
@@ -222,12 +221,11 @@ void MojoCdmService::OnCdmCreated(const InitializeCallback& callback,
void MojoCdmService::OnSessionMessage(const std::string& session_id,
MediaKeys::MessageType message_type,
- const std::vector<uint8_t>& message,
- const GURL& legacy_destination_url) {
+ const std::vector<uint8_t>& message) {
DVLOG(2) << __FUNCTION__ << "(" << message_type << ")";
- client_->OnSessionMessage(
- session_id, static_cast<mojom::CdmMessageType>(message_type),
- mojo::Array<uint8_t>::From(message), legacy_destination_url);
+ client_->OnSessionMessage(session_id,
+ static_cast<mojom::CdmMessageType>(message_type),
+ mojo::Array<uint8_t>::From(message));
}
void MojoCdmService::OnSessionKeysChange(const std::string& session_id,
@@ -256,16 +254,6 @@ void MojoCdmService::OnSessionClosed(const std::string& session_id) {
client_->OnSessionClosed(session_id);
}
-void MojoCdmService::OnLegacySessionError(const std::string& session_id,
- MediaKeys::Exception exception,
- uint32_t system_code,
- const std::string& error_message) {
- DVLOG(2) << __FUNCTION__ << "(" << exception << ") " << error_message;
- client_->OnLegacySessionError(session_id,
- static_cast<mojom::CdmException>(exception),
- system_code, error_message);
-}
-
void MojoCdmService::OnDecryptorConnectionError() {
DVLOG(2) << __FUNCTION__;

Powered by Google App Engine
This is Rietveld 408576698