| Index: media/base/android/android_cdm_factory.cc
|
| diff --git a/media/base/android/android_cdm_factory.cc b/media/base/android/android_cdm_factory.cc
|
| index 729ff7dbe80893cd28a5364c603edf5c69775bf8..cca7290194200b0f8d974fb65ab699280a8f808d 100644
|
| --- a/media/base/android/android_cdm_factory.cc
|
| +++ b/media/base/android/android_cdm_factory.cc
|
| @@ -14,8 +14,10 @@
|
|
|
| namespace media {
|
|
|
| -AndroidCdmFactory::AndroidCdmFactory(const CreateFetcherCB& create_fetcher_cb)
|
| - : create_fetcher_cb_(create_fetcher_cb) {}
|
| +AndroidCdmFactory::AndroidCdmFactory(MediaPermission* media_permission,
|
| + const CreateFetcherCB& create_fetcher_cb)
|
| + : media_permission_(media_permission),
|
| + create_fetcher_cb_(create_fetcher_cb) {}
|
|
|
| AndroidCdmFactory::~AndroidCdmFactory() {}
|
|
|
| @@ -64,8 +66,9 @@ void AndroidCdmFactory::Create(
|
| }
|
|
|
| scoped_refptr<MediaDrmBridge> cdm(MediaDrmBridge::Create(
|
| - key_system, security_level, create_fetcher_cb_, session_message_cb,
|
| - session_closed_cb, legacy_session_error_cb, session_keys_change_cb,
|
| + key_system, security_origin, security_level, media_permission_,
|
| + create_fetcher_cb_, session_message_cb, session_closed_cb,
|
| + legacy_session_error_cb, session_keys_change_cb,
|
| session_expiration_update_cb));
|
| if (!cdm) {
|
| error_message = "MediaDrmBridge cannot be created for " + key_system +
|
|
|