| Index: media/cdm/cdm_adapter.h
|
| diff --git a/media/cdm/cdm_adapter.h b/media/cdm/cdm_adapter.h
|
| index cb08f4a155d62ad63d7e75579be789c323f4e77d..72c7a8eb076659fbbd217ddbd002edf2191ef3e0 100644
|
| --- a/media/cdm/cdm_adapter.h
|
| +++ b/media/cdm/cdm_adapter.h
|
| @@ -32,6 +32,7 @@ namespace media {
|
|
|
| class AudioFramesImpl;
|
| class CdmAllocator;
|
| +class CdmFileIOProvider;
|
| class CdmWrapper;
|
|
|
| class MEDIA_EXPORT CdmAdapter : public MediaKeys,
|
| @@ -42,14 +43,16 @@ class MEDIA_EXPORT CdmAdapter : public MediaKeys,
|
| public:
|
| // Create the CDM using |cdm_path| and initialize it using |key_system| and
|
| // |cdm_config|. |allocator| is to be used whenever the CDM needs memory
|
| - // and to create VideoFrames. Callbacks will be used for events generated
|
| - // by the CDM. |cdm_created_cb| will be called when the CDM is loaded and
|
| - // initialized.
|
| + // and to create VideoFrames. |file_io_provider| is to be used whenever the
|
| + // CDM needs access to the file system. Callbacks will be used for events
|
| + // generated by the CDM. |cdm_created_cb| will be called when the CDM is
|
| + // loaded and initialized.
|
| static void Create(
|
| const std::string& key_system,
|
| const base::FilePath& cdm_path,
|
| const CdmConfig& cdm_config,
|
| scoped_ptr<CdmAllocator> allocator,
|
| + scoped_ptr<CdmFileIOProvider> file_io_provider,
|
| const SessionMessageCB& session_message_cb,
|
| const SessionClosedCB& session_closed_cb,
|
| const LegacySessionErrorCB& legacy_session_error_cb,
|
| @@ -149,6 +152,7 @@ class MEDIA_EXPORT CdmAdapter : public MediaKeys,
|
| CdmAdapter(const std::string& key_system,
|
| const CdmConfig& cdm_config,
|
| scoped_ptr<CdmAllocator> allocator,
|
| + scoped_ptr<CdmFileIOProvider> file_io_provider,
|
| const SessionMessageCB& session_message_cb,
|
| const SessionClosedCB& session_closed_cb,
|
| const LegacySessionErrorCB& legacy_session_error_cb,
|
| @@ -210,6 +214,7 @@ class MEDIA_EXPORT CdmAdapter : public MediaKeys,
|
| ChannelLayout audio_channel_layout_;
|
|
|
| scoped_ptr<CdmAllocator> allocator_;
|
| + scoped_ptr<CdmFileIOProvider> file_io_provider_;
|
|
|
| scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
|
|
|
|
|