| Index: media/cdm/ppapi/clear_key_cdm.h
|
| diff --git a/media/cdm/ppapi/clear_key_cdm.h b/media/cdm/ppapi/clear_key_cdm.h
|
| index 4c5cb3465ac94a0aebf5a8f42dadef8be5f22c3f..f578a26747e4cfc6dd6479375895d719650f6e7a 100644
|
| --- a/media/cdm/ppapi/clear_key_cdm.h
|
| +++ b/media/cdm/ppapi/clear_key_cdm.h
|
| @@ -23,6 +23,7 @@
|
| #endif
|
|
|
| namespace media {
|
| +class CdmFileIOTest;
|
| class CdmVideoDecoder;
|
| class DecoderBuffer;
|
| class FFmpegCdmAudioDecoder;
|
| @@ -143,6 +144,11 @@ class ClearKeyCdm : public ClearKeyCdmInterface {
|
| cdm::AudioFrames* audio_frames);
|
| #endif // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER
|
|
|
| + void StartCdmFileIOTest();
|
| +
|
| + // Callback for CDM File IO test.
|
| + void OnFileIOTestComplete(bool success);
|
| +
|
| Client client_;
|
| AesDecryptor decryptor_;
|
|
|
| @@ -154,7 +160,8 @@ class ClearKeyCdm : public ClearKeyCdmInterface {
|
|
|
| const bool is_decrypt_only_;
|
|
|
| - std::string heartbeat_session_id_;
|
| + std::string last_session_id_;
|
| +
|
| std::string next_heartbeat_message_;
|
|
|
| // Timer delay in milliseconds for the next host_->SetTimer() call.
|
| @@ -178,6 +185,8 @@ class ClearKeyCdm : public ClearKeyCdmInterface {
|
|
|
| scoped_ptr<CdmVideoDecoder> video_decoder_;
|
|
|
| + scoped_ptr<CdmFileIOTest> cdm_file_io_test_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(ClearKeyCdm);
|
| };
|
|
|
|
|