| Index: webkit/media/webmediaplayer_impl.h
|
| diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h
|
| index c97d51400c659b803d0596b232bd40ba1f943b98..9d6fdbc0e440a94b29ba428f2fe1ff03e809328a 100644
|
| --- a/webkit/media/webmediaplayer_impl.h
|
| +++ b/webkit/media/webmediaplayer_impl.h
|
| @@ -73,7 +73,7 @@ class WebFrame;
|
| }
|
|
|
| namespace media {
|
| -class AesDecryptor;
|
| +class Decryptor;
|
| class MediaLog;
|
| }
|
|
|
| @@ -241,7 +241,7 @@ class WebMediaPlayerImpl
|
| void OnKeyAdded(const std::string& key_system, const std::string& session_id);
|
| void OnKeyError(const std::string& key_system,
|
| const std::string& session_id,
|
| - media::AesDecryptor::KeyError error_code,
|
| + media::Decryptor::KeyError error_code,
|
| int system_code);
|
| void OnKeyMessage(const std::string& key_system,
|
| const std::string& session_id,
|
| @@ -300,7 +300,7 @@ class WebMediaPlayerImpl
|
| bool started_;
|
|
|
| // The decryptor that manages decryption keys and decrypts encrypted frames.
|
| - scoped_ptr<media::AesDecryptor> decryptor_;
|
| + scoped_ptr<media::Decryptor> decryptor_;
|
|
|
| scoped_ptr<media::MessageLoopFactory> message_loop_factory_;
|
|
|
|
|