Update To 11.40.268.0

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

diff --git a/src/content/renderer/media/cdm_session_adapter.h b/src/content/renderer/media/cdm_session_adapter.h
index a8be20d..264067e 100644 (file)
--- a/src/content/renderer/media/cdm_session_adapter.h
+++ b/src/content/renderer/media/cdm_session_adapter.h
@@ -15,17 +15,13 @@
 #include "media/base/media_keys.h"
 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleSession.h"
 
-#if defined(ENABLE_PEPPER_CDMS)
-#include "content/renderer/media/crypto/pepper_cdm_wrapper.h"
-#endif
-
 class GURL;
 
-namespace content {
+namespace media {
+class CdmFactory;
+}
 
-#if defined(ENABLE_BROWSER_CDMS)
-class RendererCdmManager;
-#endif
+namespace content {
 
 class WebContentDecryptionModuleSessionImpl;
 
@@ -38,14 +34,9 @@ class CdmSessionAdapter : public base::RefCounted<CdmSessionAdapter> {
   CdmSessionAdapter();
 
   // Returns true on success.
-  bool Initialize(
-#if defined(ENABLE_PEPPER_CDMS)
-      const CreatePepperCdmCB& create_pepper_cdm_cb,
-#elif defined(ENABLE_BROWSER_CDMS)
-      RendererCdmManager* manager,
-#endif
-      const std::string& key_system,
-      const GURL& security_origin);
+  bool Initialize(media::CdmFactory* cdm_factory,
+                  const std::string& key_system,
+                  const GURL& security_origin);
 
   // Provides a server certificate to be used to encrypt messages to the
   // license server.
@@ -76,6 +67,10 @@ class CdmSessionAdapter : public base::RefCounted<CdmSessionAdapter> {
                             media::MediaKeys::SessionType session_type,
                             scoped_ptr<media::NewSessionCdmPromise> promise);
 
+  // Loads the session specified by |web_session_id|.
+  void LoadSession(const std::string& web_session_id,
+                   scoped_ptr<media::NewSessionCdmPromise> promise);
+
   // Updates the session specified by |web_session_id| with |response|.
   void UpdateSession(const std::string& web_session_id,
                      const uint8* response,
@@ -142,10 +137,6 @@ class CdmSessionAdapter : public base::RefCounted<CdmSessionAdapter> {
 
   SessionMap sessions_;
 
-#if defined(ENABLE_BROWSER_CDMS)
-  int cdm_id_;
-#endif
-
   std::string key_system_uma_prefix_;
 
   // NOTE: Weak pointers must be invalidated before all other member variables.