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 c8d0703227ade000856cf530fa61b3ac246c717c..ec6af09b50b371c32bf081ee72eb8da3951b101e 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; |
@@ -141,6 +142,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 OnCdmFileIOTestComplete(bool success); |
+ |
Client client_; |
AesDecryptor decryptor_; |
@@ -150,7 +156,8 @@ class ClearKeyCdm : public ClearKeyCdmInterface { |
ClearKeyCdmHost* host_; |
- 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. |
@@ -174,6 +181,8 @@ class ClearKeyCdm : public ClearKeyCdmInterface { |
scoped_ptr<CdmVideoDecoder> video_decoder_; |
+ scoped_ptr<CdmFileIOTest> cdm_file_io_test_; |
+ |
DISALLOW_COPY_AND_ASSIGN(ClearKeyCdm); |
}; |