| Index: webkit/media/crypto/key_systems.h
|
| diff --git a/webkit/media/crypto/key_systems.h b/webkit/media/crypto/key_systems.h
|
| index 1822507818f11c5510d711a46ed83c3d186ae969..23b9723c4836f477e6bb726c2b82840c4c0440a1 100644
|
| --- a/webkit/media/crypto/key_systems.h
|
| +++ b/webkit/media/crypto/key_systems.h
|
| @@ -14,11 +14,6 @@ namespace WebKit {
|
| class WebString;
|
| }
|
|
|
| -namespace media {
|
| -class Decryptor;
|
| -class DecryptorClient;
|
| -}
|
| -
|
| namespace webkit_media {
|
|
|
| // Returns whether |key_sytem| is supported at all.
|
| @@ -32,10 +27,12 @@ bool IsSupportedKeySystemWithMediaMimeType(
|
| const std::vector<std::string>& codecs,
|
| const std::string& key_system);
|
|
|
| -// Creates and returns a decryptor that corresponds to the |key_system|.
|
| -// Returns NULL if the |key_system| is not supported.
|
| -scoped_ptr<media::Decryptor> CreateDecryptor(const std::string& key_system,
|
| - media::DecryptorClient* client);
|
| +// Returns whether AesDecryptor can be used for the given |key_system|.
|
| +bool CanUseAesDecryptor(const std::string& key_system);
|
| +
|
| +// Returns the plugin type given a |key_system|.
|
| +// Returns an empty string if no plugin type is found for |key_system|.
|
| +std::string GetPluginType(const std::string& key_system);
|
|
|
| } // namespace webkit_media
|
|
|
|
|