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

webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.cc

Index: webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.cc
diff --git a/webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.cc b/webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.cc
index 6590e6f528cd10fe46297147087760480df35a40..535febf4a7837eca8237ac22ba04629ed4e2d8b3 100644
--- a/webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.cc
+++ b/webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.cc
@@ -48,9 +48,9 @@ static void CopyPlane(const uint8_t* source,
   }
 }
 
-LibvpxCdmVideoDecoder::LibvpxCdmVideoDecoder(cdm::Allocator* allocator)
+LibvpxCdmVideoDecoder::LibvpxCdmVideoDecoder(cdm::Host* host)
     : is_initialized_(false),
-      allocator_(allocator),
+      host_(host),
       vpx_codec_(NULL),
       vpx_image_(NULL) {
 }
@@ -173,9 +173,9 @@ bool LibvpxCdmVideoDecoder::CopyVpxImageTo(cdm::VideoFrame* cdm_video_frame) {
   const int space_required = y_size + (uv_size * 2);
 
   DCHECK(!cdm_video_frame->FrameBuffer());
-  cdm_video_frame->SetFrameBuffer(allocator_->Allocate(space_required));
+  cdm_video_frame->SetFrameBuffer(host_->Allocate(space_required));
   if (!cdm_video_frame->FrameBuffer()) {
-    LOG(ERROR) << "CopyVpxImageTo() cdm::Allocator::Allocate failed.";
+    LOG(ERROR) << "CopyVpxImageTo() cdm::Host::Allocate failed.";
     return false;
   }
   cdm_video_frame->FrameBuffer()->SetSize(space_required);
@@ -226,9 +226,9 @@ bool LibvpxCdmVideoDecoder::CopyVpxImageTo(cdm::VideoFrame* cdm_video_frame) {
   const int space_required = y_size + u_size + v_size;
 
   DCHECK(!cdm_video_frame->FrameBuffer());
-  cdm_video_frame->SetFrameBuffer(allocator_->Allocate(space_required));
+  cdm_video_frame->SetFrameBuffer(host_->Allocate(space_required));
   if (!cdm_video_frame->FrameBuffer()) {
-    LOG(ERROR) << "CopyVpxImageTo() cdm::Allocator::Allocate failed.";
+    LOG(ERROR) << "CopyVpxImageTo() cdm::Host::Allocate failed.";
     return false;
   }
   cdm_video_frame->FrameBuffer()->SetSize(space_required);