Index: media/blink/encrypted_media_player_support.h |
diff --git a/content/renderer/media/crypto/encrypted_media_player_support.h b/media/blink/encrypted_media_player_support.h |
similarity index 84% |
rename from content/renderer/media/crypto/encrypted_media_player_support.h |
rename to media/blink/encrypted_media_player_support.h |
index 59a4e2468cb7a2eb23cb7c49c895152c6d579ff6..b3876866c7d1508c0e5037532625d19e1fc5503f 100644 |
--- a/content/renderer/media/crypto/encrypted_media_player_support.h |
+++ b/media/blink/encrypted_media_player_support.h |
@@ -2,11 +2,12 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CONTENT_RENDERER_MEDIA_CRYPTO_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_ |
-#define CONTENT_RENDERER_MEDIA_CRYPTO_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_ |
+#ifndef MEDIA_BLINK_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_ |
+#define MEDIA_BLINK_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_ |
#include "media/base/decryptor.h" |
#include "media/base/demuxer.h" |
+#include "media/base/media_export.h" |
#include "third_party/WebKit/public/platform/WebMediaPlayer.h" |
namespace blink { |
@@ -17,9 +18,9 @@ class WebMediaPlayerClient; |
class WebString; |
} |
-namespace content { |
+namespace media { |
-class EncryptedMediaPlayerSupport { |
+class MEDIA_EXPORT EncryptedMediaPlayerSupport { |
public: |
EncryptedMediaPlayerSupport(); |
virtual ~EncryptedMediaPlayerSupport(); |
@@ -59,12 +60,12 @@ class EncryptedMediaPlayerSupport { |
// Creates a callback that Demuxers can use to signal that the content |
// requires a key. This method make sure the callback returned can be safely |
// invoked from any thread. |
- virtual media::Demuxer::NeedKeyCB CreateNeedKeyCB() = 0; |
+ virtual Demuxer::NeedKeyCB CreateNeedKeyCB() = 0; |
// Creates a callback that renderers can use to set decryptor |
// ready callback. This method make sure the callback returned can be safely |
// invoked from any thread. |
- virtual media::SetDecryptorReadyCB CreateSetDecryptorReadyCB() = 0; |
+ virtual SetDecryptorReadyCB CreateSetDecryptorReadyCB() = 0; |
// Called to inform this object that the media pipeline encountered |
// and handled a decryption error. |
@@ -74,6 +75,6 @@ class EncryptedMediaPlayerSupport { |
DISALLOW_COPY_AND_ASSIGN(EncryptedMediaPlayerSupport); |
}; |
-} // namespace content |
+} // namespace media |
-#endif // CONTENT_RENDERER_MEDIA_CRYPTO_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_ |
+#endif // MEDIA_BLINK_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_ |