Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / renderer / media / webcontentdecryptionmodule_impl.h

diff --git a/src/content/renderer/media/webcontentdecryptionmodule_impl.h b/src/content/renderer/media/webcontentdecryptionmodule_impl.h
index fd724a6..c535db7 100644 (file)
--- a/src/content/renderer/media/webcontentdecryptionmodule_impl.h
+++ b/src/content/renderer/media/webcontentdecryptionmodule_impl.h
@@ -5,12 +5,11 @@
 #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"
 #include "third_party/WebKit/public/platform/WebContentDecryptionModule.h"
+#include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h"
 
 namespace blink {
 #if defined(ENABLE_PEPPER_CDMS)
@@ -20,6 +19,7 @@ class WebSecurityOrigin;
 }
 
 namespace media {
+class CdmFactory;
 class Decryptor;
 class MediaKeys;
 }
@@ -27,20 +27,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
+      media::CdmFactory* cdm_factory,
       const blink::WebSecurityOrigin& security_origin,
       const base::string16& key_system);