Index: webkit/media/crypto/ppapi/clear_key_cdm.h |
diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.h b/webkit/media/crypto/ppapi/clear_key_cdm.h |
index eda54208c81ab634b2c9ec0c24e0208e4aa5396d..af273002c23aeb49384a860a1c41c648080e4fb3 100644 |
--- a/webkit/media/crypto/ppapi/clear_key_cdm.h |
+++ b/webkit/media/crypto/ppapi/clear_key_cdm.h |
@@ -12,7 +12,6 @@ |
#include "base/memory/ref_counted.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/synchronization/lock.h" |
-#include "media/base/decryptor_client.h" |
#include "media/crypto/aes_decryptor.h" |
#include "webkit/media/crypto/ppapi/cdm/content_decryption_module.h" |
@@ -63,7 +62,9 @@ class ClearKeyCdm : public cdm::ContentDecryptionModule { |
cdm::AudioFrames* audio_frames) OVERRIDE; |
private: |
- class Client : public media::DecryptorClient { |
+ // TODO(xhwang): After we removed DecryptorClient. We probably can also remove |
+ // this Client class as well. Investigate this possibility. |
+ class Client { |
public: |
enum Status { |
kKeyAdded, |
@@ -83,22 +84,19 @@ class ClearKeyCdm : public cdm::ContentDecryptionModule { |
// Resets the Client to a clean state. |
void Reset(); |
- // media::DecryptorClient implementation. |
- virtual void KeyAdded(const std::string& key_system, |
- const std::string& session_id) OVERRIDE; |
- virtual void KeyError(const std::string& key_system, |
- const std::string& session_id, |
- media::Decryptor::KeyError error_code, |
- int system_code) OVERRIDE; |
- virtual void KeyMessage(const std::string& key_system, |
- const std::string& session_id, |
- const std::string& message, |
- const std::string& default_url) OVERRIDE; |
- virtual void NeedKey(const std::string& key_system, |
- const std::string& session_id, |
- const std::string& type, |
- scoped_array<uint8> init_data, |
- int init_data_length) OVERRIDE; |
+ void KeyAdded(const std::string& key_system, const std::string& session_id); |
+ void KeyError(const std::string& key_system, |
+ const std::string& session_id, |
+ media::Decryptor::KeyError error_code, |
+ int system_code); |
+ void KeyMessage(const std::string& key_system, |
+ const std::string& session_id, |
+ const std::string& message, |
+ const std::string& default_url); |
+ void NeedKey(const std::string& key_system, |
+ const std::string& session_id, |
+ const std::string& type, |
+ scoped_array<uint8> init_data, int init_data_length); |
private: |
Status status_; |