Update Cdm Wrapper and ClearKeyCdm to work with CDM interface version 4.

webkit/media/crypto/ppapi/clear_key_cdm.cc

Index: webkit/media/crypto/ppapi/clear_key_cdm.cc
diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.cc b/webkit/media/crypto/ppapi/clear_key_cdm.cc
index 53af6fd1c7a31c9c2f0f7b68136369610bdb6fbc..8f06143d8ff0ecb03809e44278fef88dbcdbcfd9 100644
--- a/webkit/media/crypto/ppapi/clear_key_cdm.cc
+++ b/webkit/media/crypto/ppapi/clear_key_cdm.cc
@@ -125,13 +125,20 @@ void INITIALIZE_CDM_MODULE() {
 void DeinitializeCdmModule() {
 }
 
-cdm::ContentDecryptionModule* CreateCdmInstance(const char* key_system_arg,
-                                                int key_system_size,
-                                                cdm::Allocator* allocator,
-                                                cdm::Host* host) {
+cdm::ContentDecryptionModule* CreateCdmInstance(
+    const char* key_system_arg,
+    int key_system_size,
+    cdm::Allocator* allocator,
+    cdm::HostFactory* host_factory) {
   DVLOG(1) << "CreateCdmInstance()";
   DCHECK_EQ(std::string(key_system_arg, key_system_size), kExternalClearKey);
-  return new webkit_media::ClearKeyCdm(allocator, host);
+
+  void* host = host_factory->GetCdmHost(CDM_HOST_INTERFACE);
+  if (!host)
+    return NULL;
+
+  return new webkit_media::ClearKeyCdm(allocator,
+                                       reinterpret_cast<cdm::Host*>(host));

[ddorwin, 2013/02/08 04:36:47]

You could do the reinterpret_cast at 136.

[xhwang, 2013/02/08 07:11:57]

Done.

 }
 
 void DestroyCdmInstance(cdm::ContentDecryptionModule* instance) {