Index: content/renderer/media/webcontentdecryptionmodule_impl.cc |
diff --git a/content/renderer/media/webcontentdecryptionmodule_impl.cc b/content/renderer/media/webcontentdecryptionmodule_impl.cc |
index a9b201fbc13278ef319526c73ae64eb7f7edff4f..206a7cc7017c5736392acd239afebc3fcafb2aab 100644 |
--- a/content/renderer/media/webcontentdecryptionmodule_impl.cc |
+++ b/content/renderer/media/webcontentdecryptionmodule_impl.cc |
@@ -44,6 +44,7 @@ WebContentDecryptionModuleImpl* WebContentDecryptionModuleImpl::Create( |
} |
scoped_refptr<CdmSessionAdapter> adapter(new CdmSessionAdapter()); |
+ |
if (!adapter->Initialize( |
#if defined(ENABLE_PEPPER_CDMS) |
base::Bind(&PepperCdmWrapperImpl::Create, frame), |
@@ -57,8 +58,7 @@ WebContentDecryptionModuleImpl* WebContentDecryptionModuleImpl::Create( |
WebContentDecryptionModuleImpl::WebContentDecryptionModuleImpl( |
scoped_refptr<CdmSessionAdapter> adapter) |
- : adapter_(adapter) { |
-} |
+ : adapter_(adapter) {} |
WebContentDecryptionModuleImpl::~WebContentDecryptionModuleImpl() { |
} |
@@ -74,4 +74,10 @@ media::Decryptor* WebContentDecryptionModuleImpl::GetDecryptor() { |
return adapter_->GetDecryptor(); |
} |
+#if defined(OS_ANDROID) |
+int WebContentDecryptionModuleImpl::GetCdmId() const { |
+ return adapter_->GetCdmId(); |
+} |
+#endif // defined(OS_ANDROID) |
+ |
} // namespace content |