| 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 79357c293d91e74351cf2c2bb0601dc14d9eb763..15e2fbf61994b3eeb55b9abf3436905e13c0f94e 100644
|
| --- a/content/renderer/media/crypto/proxy_media_keys.cc
|
| +++ b/content/renderer/media/crypto/proxy_media_keys.cc
|
| @@ -20,6 +20,7 @@ namespace content {
|
| void ProxyMediaKeys::Create(
|
| const std::string& key_system,
|
| const GURL& security_origin,
|
| + bool use_secure_codecs,
|
| RendererCdmManager* manager,
|
| const media::SessionMessageCB& session_message_cb,
|
| const media::SessionClosedCB& session_closed_cb,
|
| @@ -38,7 +39,7 @@ void ProxyMediaKeys::Create(
|
| scoped_ptr<CdmInitializedPromise> promise(
|
| new CdmInitializedPromise(cdm_created_cb, proxy_media_keys.Pass()));
|
| proxy_media_keys_copy->InitializeCdm(key_system, security_origin,
|
| - promise.Pass());
|
| + use_secure_codecs, promise.Pass());
|
| }
|
|
|
| ProxyMediaKeys::~ProxyMediaKeys() {
|
| @@ -204,10 +205,11 @@ ProxyMediaKeys::ProxyMediaKeys(
|
| void ProxyMediaKeys::InitializeCdm(
|
| const std::string& key_system,
|
| const GURL& security_origin,
|
| + bool use_secure_codecs,
|
| scoped_ptr<media::SimpleCdmPromise> promise) {
|
| uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass());
|
| manager_->InitializeCdm(cdm_id_, promise_id, this, key_system,
|
| - security_origin);
|
| + security_origin, use_secure_codecs);
|
| }
|
|
|
| } // namespace content
|
|
|