Index: content/renderer/media/webcontentdecryptionmodule_impl.cc |
diff --git a/content/renderer/media/webcontentdecryptionmodule_impl.cc b/content/renderer/media/webcontentdecryptionmodule_impl.cc |
index 0c4a901f74699a0c95c4910edb4624297f445a86..75ac846f8f21bc960593088de20257209b053488 100644 |
--- a/content/renderer/media/webcontentdecryptionmodule_impl.cc |
+++ b/content/renderer/media/webcontentdecryptionmodule_impl.cc |
@@ -50,6 +50,7 @@ WebContentDecryptionModuleImpl* WebContentDecryptionModuleImpl::Create( |
} |
scoped_refptr<CdmSessionAdapter> adapter(new CdmSessionAdapter()); |
+ |
if (!adapter->Initialize( |
#if defined(ENABLE_PEPPER_CDMS) |
base::Bind(&PepperCdmWrapperImpl::Create, frame), |
@@ -63,8 +64,7 @@ WebContentDecryptionModuleImpl* WebContentDecryptionModuleImpl::Create( |
WebContentDecryptionModuleImpl::WebContentDecryptionModuleImpl( |
scoped_refptr<CdmSessionAdapter> adapter) |
- : adapter_(adapter) { |
-} |
+ : adapter_(adapter) {} |
WebContentDecryptionModuleImpl::~WebContentDecryptionModuleImpl() { |
} |
@@ -80,4 +80,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 |