Encrypted Media: Implement IPC based SetCdm().

content/renderer/media/webcontentdecryptionmodule_impl.cc

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..ace14752f0631a1ea10173f42e40994be840c2c0 100644
--- a/content/renderer/media/webcontentdecryptionmodule_impl.cc
+++ b/content/renderer/media/webcontentdecryptionmodule_impl.cc
@@ -19,6 +19,8 @@
 
 #if defined(ENABLE_PEPPER_CDMS)
 #include "content/renderer/media/crypto/pepper_cdm_wrapper_impl.h"
+#elif defined(OS_ANDROID)
+#include "content/renderer/media/android/renderer_media_player_manager.h"
 #endif
 
 namespace blink {
@@ -50,21 +52,38 @@ WebContentDecryptionModuleImpl* WebContentDecryptionModuleImpl::Create(
   }
 
   scoped_refptr<CdmSessionAdapter> adapter(new CdmSessionAdapter());
+
+#if defined(OS_ANDROID)
+  int cdm_id = RendererMediaPlayerManager::kInvalidCdmId;
+#endif
+
   if (!adapter->Initialize(
 #if defined(ENABLE_PEPPER_CDMS)
           base::Bind(&PepperCdmWrapperImpl::Create, frame),
+#elif defined(OS_ANDROID)
+          &cdm_id,
 #endif
           base::UTF16ToASCII(key_system))) {
     return NULL;
   }
 
-  return new WebContentDecryptionModuleImpl(adapter);
+  return new WebContentDecryptionModuleImpl(
+#if defined(OS_ANDROID)
+      adapter, cdm_id);
+#else
+      adapter);
+#endif
 }
 
 WebContentDecryptionModuleImpl::WebContentDecryptionModuleImpl(
+#if defined(OS_ANDROID)
+    scoped_refptr<CdmSessionAdapter> adapter,
+    int cdm_id)
+    : adapter_(adapter), cdm_id_(cdm_id) {}
+#else
     scoped_refptr<CdmSessionAdapter> adapter)
-    : adapter_(adapter) {
-}
+    : adapter_(adapter) {}
+#endif
 
 WebContentDecryptionModuleImpl::~WebContentDecryptionModuleImpl() {
 }
@@ -80,4 +99,10 @@ media::Decryptor* WebContentDecryptionModuleImpl::GetDecryptor() {
   return adapter_->GetDecryptor();
 }
 
+#if defined(OS_ANDROID)
+int WebContentDecryptionModuleImpl::GetCdmId() {
+  return cdm_id_;
+}
+#endif  // defined(OS_ANDROID)
+
 }  // namespace content