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

webkit/media/crypto/ppapi/clear_key_cdm.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/media/crypto/ppapi/clear_key_cdm.h"
 
 #include <algorithm>
 #include <sstream>
 #include <string>
 #include <vector>
@@ skipping 107 matching lines @@
 void INITIALIZE_CDM_MODULE() {
 #if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
   DVLOG(2) << "FFmpeg libraries initialized: " << g_ffmpeg_lib_initialized;
   av_register_all();
 #endif  // CLEAR_KEY_CDM_USE_FFMPEG_DECODER
 }
 
 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) {
   DVLOG(1) << "DestroyCdmInstance()";
   delete instance;
 }
 
 const char* GetCdmVersion() {
   return kClearKeyCdmVersion;
 }
@@ skipping 404 matching lines @@
   int samples_generated = GenerateFakeAudioFramesFromDuration(
       timestamp_in_microseconds - CurrentTimeStampInMicroseconds(),
       audio_frames);
   total_samples_generated_ += samples_generated;
 
   return samples_generated == 0 ? cdm::kNeedMoreData : cdm::kSuccess;
 }
 #endif  // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER
 
 }  // namespace webkit_media