| Index: content/renderer/media/crypto/proxy_media_keys.cc
|
| diff --git a/content/renderer/media/crypto/proxy_media_keys.cc b/content/renderer/media/crypto/proxy_media_keys.cc
|
| index 87d078834daca88d0f1db828e2a68c1c181f3ffe..e62c6cea1fdc0410b26e615869a5c1aeb4497f46 100644
|
| --- a/content/renderer/media/crypto/proxy_media_keys.cc
|
| +++ b/content/renderer/media/crypto/proxy_media_keys.cc
|
| @@ -142,6 +142,10 @@ void ProxyMediaKeys::GetUsableKeyIds(const std::string& web_session_id,
|
| promise->reject(NOT_SUPPORTED_ERROR, 0, "Not yet implemented.");
|
| }
|
|
|
| +int ProxyMediaKeys::GetCdmId() const {
|
| + return cdm_id_;
|
| +}
|
| +
|
| void ProxyMediaKeys::OnSessionCreated(uint32 session_id,
|
| const std::string& web_session_id) {
|
| AssignWebSessionId(session_id, web_session_id);
|
| @@ -218,10 +222,6 @@ void ProxyMediaKeys::OnSessionError(uint32 session_id,
|
| web_session_id, exception_code, system_code, std::string());
|
| }
|
|
|
| -int ProxyMediaKeys::GetCdmId() const {
|
| - return cdm_id_;
|
| -}
|
| -
|
| ProxyMediaKeys::ProxyMediaKeys(
|
| RendererCdmManager* manager,
|
| const media::SessionMessageCB& session_message_cb,
|
|
|