| Index: content/renderer/media/webcontentdecryptionmodule_impl.h
|
| diff --git a/content/renderer/media/webcontentdecryptionmodule_impl.h b/content/renderer/media/webcontentdecryptionmodule_impl.h
|
| index fd724a69f814917c42b6b0f75ec792b28b5fe660..86f6449533f042ae0f9f9d2f3f005e730e3cd7c3 100644
|
| --- a/content/renderer/media/webcontentdecryptionmodule_impl.h
|
| +++ b/content/renderer/media/webcontentdecryptionmodule_impl.h
|
| @@ -5,8 +5,6 @@
|
| #ifndef CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULE_IMPL_H_
|
| #define CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULE_IMPL_H_
|
|
|
| -#include <string>
|
| -
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string16.h"
|
| @@ -20,6 +18,7 @@ class WebSecurityOrigin;
|
| }
|
|
|
| namespace media {
|
| +class CdmFactory;
|
| class Decryptor;
|
| class MediaKeys;
|
| }
|
| @@ -27,20 +26,13 @@ class MediaKeys;
|
| namespace content {
|
|
|
| class CdmSessionAdapter;
|
| -#if defined(ENABLE_BROWSER_CDMS)
|
| -class RendererCdmManager;
|
| -#endif
|
| class WebContentDecryptionModuleSessionImpl;
|
|
|
| class WebContentDecryptionModuleImpl
|
| : public blink::WebContentDecryptionModule {
|
| public:
|
| static WebContentDecryptionModuleImpl* Create(
|
| -#if defined(ENABLE_PEPPER_CDMS)
|
| - blink::WebLocalFrame* frame,
|
| -#elif defined(ENABLE_BROWSER_CDMS)
|
| - RendererCdmManager* manager,
|
| -#endif
|
| + const media::CdmFactory& cdm_factory,
|
| const blink::WebSecurityOrigin& security_origin,
|
| const base::string16& key_system);
|
|
|
|
|