Upstream version 7.36.149.0

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

diff --git a/src/content/renderer/media/crypto/content_decryption_module_factory.h b/src/content/renderer/media/crypto/content_decryption_module_factory.h
index 418c5e5..d7d8269 100644 (file)
--- a/src/content/renderer/media/crypto/content_decryption_module_factory.h
+++ b/src/content/renderer/media/crypto/content_decryption_module_factory.h
@@ -26,12 +26,12 @@ class ContentDecryptionModuleFactory {
   // callbacks can be called asynchronously.
   static scoped_ptr<media::MediaKeys> Create(
       const std::string& key_system,
+      const GURL& security_origin,
 #if defined(ENABLE_PEPPER_CDMS)
       const CreatePepperCdmCB& create_pepper_cdm_cb,
 #elif defined(OS_ANDROID)
       RendererMediaPlayerManager* manager,
-      int cdm_id,
-      const GURL& frame_url,
+      int* cdm_id,  // Output parameter indicating the CDM ID of the MediaKeys.
 #endif  // defined(ENABLE_PEPPER_CDMS)
       const media::SessionCreatedCB& session_created_cb,
       const media::SessionMessageCB& session_message_cb,