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

webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h

 // 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.
 
 #ifndef WEBKIT_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_
 #define WEBKIT_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "webkit/media/crypto/ppapi/cdm/content_decryption_module.h"
 #include "webkit/media/crypto/ppapi/cdm_video_decoder.h"
 
 struct AVCodecContext;
 struct AVFrame;
 
 namespace webkit_media {
 
 class FFmpegCdmVideoDecoder : public CdmVideoDecoder {
  public:
-  explicit FFmpegCdmVideoDecoder(cdm::Allocator* allocator);
+  explicit FFmpegCdmVideoDecoder(cdm::Host* host);
   virtual ~FFmpegCdmVideoDecoder();
 
   // CdmVideoDecoder implementation.
   virtual bool Initialize(const cdm::VideoDecoderConfig& config) OVERRIDE;
   virtual void Deinitialize() OVERRIDE;
   virtual void Reset() OVERRIDE;
   virtual cdm::Status DecodeFrame(const uint8_t* compressed_frame,
                                   int32_t compressed_frame_size,
                                   int64_t timestamp,
                                   cdm::VideoFrame* decoded_frame) OVERRIDE;
@@ skipping 10 matching lines @@
   bool CopyAvFrameTo(cdm::VideoFrame* cdm_video_frame);
 
   void ReleaseFFmpegResources();
 
   // FFmpeg structures owned by this object.
   AVCodecContext* codec_context_;
   AVFrame* av_frame_;
 
   bool is_initialized_;
 
-  cdm::Allocator* const allocator_;
+  cdm::Host* const host_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegCdmVideoDecoder);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_