| Index: content/renderer/media/android/proxy_media_keys.cc
|
| diff --git a/content/renderer/media/android/proxy_media_keys.cc b/content/renderer/media/android/proxy_media_keys.cc
|
| index 9734e815e785ab7963e77947edfa159ec00d8c89..bd498a0d9694e1eaa448a815e1a9c6ca93b9c7a3 100644
|
| --- a/content/renderer/media/android/proxy_media_keys.cc
|
| +++ b/content/renderer/media/android/proxy_media_keys.cc
|
| @@ -13,16 +13,18 @@
|
|
|
| namespace content {
|
|
|
| +int ProxyMediaKeys::next_cdm_id_ =
|
| + RendererMediaPlayerManager::kInvalidCdmId + 1;
|
| +
|
| ProxyMediaKeys::ProxyMediaKeys(
|
| RendererMediaPlayerManager* manager,
|
| - int cdm_id,
|
| const media::SessionCreatedCB& session_created_cb,
|
| const media::SessionMessageCB& session_message_cb,
|
| const media::SessionReadyCB& session_ready_cb,
|
| const media::SessionClosedCB& session_closed_cb,
|
| const media::SessionErrorCB& session_error_cb)
|
| : manager_(manager),
|
| - cdm_id_(cdm_id),
|
| + cdm_id_(next_cdm_id_++),
|
| session_created_cb_(session_created_cb),
|
| session_message_cb_(session_message_cb),
|
| session_ready_cb_(session_ready_cb),
|
| @@ -111,4 +113,8 @@ void ProxyMediaKeys::OnSessionError(uint32 session_id,
|
| session_error_cb_.Run(session_id, error_code, system_code);
|
| }
|
|
|
| +int ProxyMediaKeys::GetCdmId() const {
|
| + return cdm_id_;
|
| +}
|
| +
|
| } // namespace content
|
|
|