Index: content/renderer/media/crypto/ppapi_decryptor.h |
diff --git a/content/renderer/media/crypto/ppapi_decryptor.h b/content/renderer/media/crypto/ppapi_decryptor.h |
index 875233ca5438444195af16edb0e2ad71e7f00c64..95c5f74a4c3e9a23efabc23e486d6206c9041bce 100644 |
--- a/content/renderer/media/crypto/ppapi_decryptor.h |
+++ b/content/renderer/media/crypto/ppapi_decryptor.h |
@@ -42,14 +42,14 @@ class PpapiDecryptor : public media::MediaKeys, public media::Decryptor { |
virtual ~PpapiDecryptor(); |
// media::MediaKeys implementation. |
- virtual bool CreateSession(uint32 reference_id, |
+ virtual bool CreateSession(uint32 session_id, |
const std::string& type, |
const uint8* init_data, |
int init_data_length) OVERRIDE; |
- virtual void UpdateSession(uint32 reference_id, |
+ virtual void UpdateSession(uint32 session_id, |
const uint8* response, |
int response_length) OVERRIDE; |
- virtual void ReleaseSession(uint32 reference_id) OVERRIDE; |
+ virtual void ReleaseSession(uint32 session_id) OVERRIDE; |
virtual Decryptor* GetDecryptor() OVERRIDE; |
// media::Decryptor implementation. |
@@ -82,18 +82,18 @@ class PpapiDecryptor : public media::MediaKeys, public media::Decryptor { |
const media::SessionErrorCB& session_error_cb, |
const base::Closure& destroy_plugin_cb); |
- void ReportFailureToCallPlugin(uint32 reference_id); |
+ void ReportFailureToCallPlugin(uint32 session_id); |
void OnDecoderInitialized(StreamType stream_type, bool success); |
// Callbacks for |plugin_cdm_delegate_| to fire session events. |
- void OnSessionCreated(uint32 reference_id, const std::string& session_id); |
- void OnSessionMessage(uint32 reference_id, |
+ void OnSessionCreated(uint32 session_id, const std::string& web_session_id); |
+ void OnSessionMessage(uint32 session_id, |
const std::vector<uint8>& message, |
const std::string& destination_url); |
- void OnSessionReady(uint32 reference_id); |
- void OnSessionClosed(uint32 reference_id); |
- void OnSessionError(uint32 reference_id, |
+ void OnSessionReady(uint32 session_id); |
+ void OnSessionClosed(uint32 session_id); |
+ void OnSessionError(uint32 session_id, |
media::MediaKeys::KeyError error_code, |
int system_code); |