Index: content/browser/media/android/browser_media_player_manager.cc |
diff --git a/content/browser/media/android/browser_media_player_manager.cc b/content/browser/media/android/browser_media_player_manager.cc |
index 5d457e40809ca9bb6d0c95cc32edd44467653a37..2848cd2f0743f7d3264cef55b63df1b2a0c1d572 100644 |
--- a/content/browser/media/android/browser_media_player_manager.cc |
+++ b/content/browser/media/android/browser_media_player_manager.cc |
@@ -139,12 +139,11 @@ bool BrowserMediaPlayerManager::OnMessageReceived(const IPC::Message& msg) { |
IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyMediaPlayer, OnDestroyPlayer) |
IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DestroyAllMediaPlayers, |
DestroyAllMediaPlayers) |
- IPC_MESSAGE_HANDLER(MediaKeysHostMsg_InitializeCDM, |
- OnInitializeCDM) |
- IPC_MESSAGE_HANDLER(MediaKeysHostMsg_CreateSession, OnCreateSession) |
- IPC_MESSAGE_HANDLER(MediaKeysHostMsg_UpdateSession, OnUpdateSession) |
- IPC_MESSAGE_HANDLER(MediaKeysHostMsg_ReleaseSession, OnReleaseSession) |
- IPC_MESSAGE_HANDLER(MediaKeysHostMsg_CancelAllPendingSessionCreations, |
+ IPC_MESSAGE_HANDLER(CdmHostMsg_InitializeCDM, OnInitializeCDM) |
+ IPC_MESSAGE_HANDLER(CdmHostMsg_CreateSession, OnCreateSession) |
+ IPC_MESSAGE_HANDLER(CdmHostMsg_UpdateSession, OnUpdateSession) |
+ IPC_MESSAGE_HANDLER(CdmHostMsg_ReleaseSession, OnReleaseSession) |
+ IPC_MESSAGE_HANDLER(CdmHostMsg_CancelAllPendingSessionCreations, |
OnCancelAllPendingSessionCreations) |
#if defined(VIDEO_HOLE) |
IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_NotifyExternalSurface, |
@@ -417,7 +416,7 @@ void BrowserMediaPlayerManager::OnSessionCreated( |
int media_keys_id, |
uint32 session_id, |
const std::string& web_session_id) { |
- Send(new MediaKeysMsg_SessionCreated( |
+ Send(new CdmMsg_SessionCreated( |
routing_id(), media_keys_id, session_id, web_session_id)); |
} |
@@ -426,18 +425,18 @@ void BrowserMediaPlayerManager::OnSessionMessage( |
uint32 session_id, |
const std::vector<uint8>& message, |
const GURL& destination_url) { |
- Send(new MediaKeysMsg_SessionMessage( |
+ Send(new CdmMsg_SessionMessage( |
routing_id(), media_keys_id, session_id, message, destination_url)); |
} |
void BrowserMediaPlayerManager::OnSessionReady(int media_keys_id, |
uint32 session_id) { |
- Send(new MediaKeysMsg_SessionReady(routing_id(), media_keys_id, session_id)); |
+ Send(new CdmMsg_SessionReady(routing_id(), media_keys_id, session_id)); |
} |
void BrowserMediaPlayerManager::OnSessionClosed(int media_keys_id, |
uint32 session_id) { |
- Send(new MediaKeysMsg_SessionClosed(routing_id(), media_keys_id, session_id)); |
+ Send(new CdmMsg_SessionClosed(routing_id(), media_keys_id, session_id)); |
} |
void BrowserMediaPlayerManager::OnSessionError( |
@@ -445,7 +444,7 @@ void BrowserMediaPlayerManager::OnSessionError( |
uint32 session_id, |
media::MediaKeys::KeyError error_code, |
int system_code) { |
- Send(new MediaKeysMsg_SessionError( |
+ Send(new CdmMsg_SessionError( |
routing_id(), media_keys_id, session_id, error_code, system_code)); |
} |
@@ -623,7 +622,7 @@ void BrowserMediaPlayerManager::OnInitializeCDM( |
void BrowserMediaPlayerManager::OnCreateSession( |
int media_keys_id, |
uint32 session_id, |
- MediaKeysHostMsg_CreateSession_Type content_type, |
+ CdmHostMsg_CreateSession_Type content_type, |
const std::vector<uint8>& init_data) { |
if (init_data.size() > kEmeInitDataMaximum) { |
LOG(WARNING) << "InitData for ID: " << media_keys_id |