| Index: content/common/media/media_player_messages_android.h
|
| diff --git a/content/common/media/media_player_messages_android.h b/content/common/media/media_player_messages_android.h
|
| index efc313c47bbcc848e67f57efa2fd46d6df6a0796..8ee87f360081deaea773af9ef0bca846552b2e10 100644
|
| --- a/content/common/media/media_player_messages_android.h
|
| +++ b/content/common/media/media_player_messages_android.h
|
| @@ -215,33 +215,37 @@ IPC_MESSAGE_ROUTED3(MediaPlayerHostMsg_NotifyExternalSurface,
|
|
|
| // Messages for encrypted media extensions API ------------------------------
|
|
|
| +IPC_MESSAGE_ROUTED2(MediaPlayerHostMsg_InitializeCDM,
|
| + int /* media_keys_id */,
|
| + std::vector<uint8> /* uuid */)
|
| +
|
| IPC_MESSAGE_ROUTED3(MediaPlayerHostMsg_GenerateKeyRequest,
|
| - int /* player_id */,
|
| + int /* media_keys_id */,
|
| std::string /* type */,
|
| std::vector<uint8> /* init_data */)
|
|
|
| IPC_MESSAGE_ROUTED4(MediaPlayerHostMsg_AddKey,
|
| - int /* player_id */,
|
| + int /* media_keys_id */,
|
| std::vector<uint8> /* key */,
|
| std::vector<uint8> /* init_data */,
|
| std::string /* session_id */)
|
|
|
| IPC_MESSAGE_ROUTED2(MediaPlayerHostMsg_CancelKeyRequest,
|
| - int /* player_id */,
|
| + int /* media_keys_id */,
|
| std::string /* session_id */)
|
|
|
| IPC_MESSAGE_ROUTED2(MediaPlayerMsg_KeyAdded,
|
| - int /* player_id */,
|
| + int /* media_keys_id */,
|
| std::string /* session_id */)
|
|
|
| IPC_MESSAGE_ROUTED4(MediaPlayerMsg_KeyError,
|
| - int /* player_id */,
|
| + int /* media_keys_id */,
|
| std::string /* session_id */,
|
| media::MediaKeys::KeyError /* error_code */,
|
| int /* system_code */)
|
|
|
| IPC_MESSAGE_ROUTED4(MediaPlayerMsg_KeyMessage,
|
| - int /* player_id */,
|
| + int /* media_keys_id */,
|
| std::string /* session_id */,
|
| std::string /* message */,
|
| std::string /* destination_url */)
|
|
|