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

Unified Diff: content/browser/media/cdm/browser_cdm_manager.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: content/browser/media/cdm/browser_cdm_manager.cc
diff --git a/content/browser/media/cdm/browser_cdm_manager.cc b/content/browser/media/cdm/browser_cdm_manager.cc
index b5e0c96058b12aa227afc976cca9e145810a892c..7202c956f5f60b3bbda82f8ef7af1eb9722f7f1d 100644
--- a/content/browser/media/cdm/browser_cdm_manager.cc
+++ b/content/browser/media/cdm/browser_cdm_manager.cc
@@ -309,18 +309,9 @@ void BrowserCdmManager::OnSessionMessage(int render_frame_id,
int cdm_id,
const std::string& session_id,
MediaKeys::MessageType message_type,
- const std::vector<uint8_t>& message,
- const GURL& legacy_destination_url) {
- GURL verified_gurl = legacy_destination_url;
- if (!verified_gurl.is_valid() && !verified_gurl.is_empty()) {
- DLOG(WARNING) << "SessionMessage legacy_destination_url is invalid : "
- << legacy_destination_url.possibly_invalid_spec();
- verified_gurl =
- GURL::EmptyGURL(); // Replace invalid legacy_destination_url.
- }
-
+ const std::vector<uint8_t>& message) {
Send(new CdmMsg_SessionMessage(render_frame_id, cdm_id, session_id,
- message_type, message, verified_gurl));
+ message_type, message));
}
void BrowserCdmManager::OnSessionClosed(int render_frame_id,
@@ -329,18 +320,6 @@ void BrowserCdmManager::OnSessionClosed(int render_frame_id,
Send(new CdmMsg_SessionClosed(render_frame_id, cdm_id, session_id));
}
-void BrowserCdmManager::OnLegacySessionError(
- int render_frame_id,
- int cdm_id,
- const std::string& session_id,
- MediaKeys::Exception exception_code,
- uint32_t system_code,
- const std::string& error_message) {
- Send(new CdmMsg_LegacySessionError(render_frame_id, cdm_id, session_id,
- exception_code, system_code,
- error_message));
-}
-
void BrowserCdmManager::OnSessionKeysChange(int render_frame_id,
int cdm_id,
const std::string& session_id,
@@ -404,7 +383,6 @@ void BrowserCdmManager::OnInitializeCdm(
params.key_system, params.security_origin, cdm_config,
BROWSER_CDM_MANAGER_CB(OnSessionMessage),
BROWSER_CDM_MANAGER_CB(OnSessionClosed),
- BROWSER_CDM_MANAGER_CB(OnLegacySessionError),
BROWSER_CDM_MANAGER_CB(OnSessionKeysChange),
BROWSER_CDM_MANAGER_CB(OnSessionExpirationUpdate),
BROWSER_CDM_MANAGER_CB(OnCdmCreated, params.security_origin,

Powered by Google App Engine
This is Rietveld 408576698