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

webkit/media/crypto/ppapi/fake_cdm_video_decoder.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/fake_cdm_video_decoder.h"
 
 #include "base/logging.h"
 #include "webkit/media/crypto/ppapi/cdm/content_decryption_module.h"
 
 namespace webkit_media {
 
-FakeCdmVideoDecoder::FakeCdmVideoDecoder(cdm::Allocator* allocator)
+FakeCdmVideoDecoder::FakeCdmVideoDecoder(cdm::Host* host)
     : is_initialized_(false),
-      allocator_(allocator) {
+      host_(host) {
 }
 
 FakeCdmVideoDecoder::~FakeCdmVideoDecoder() {
   Deinitialize();
 }
 
 bool FakeCdmVideoDecoder::Initialize(const cdm::VideoDecoderConfig& config) {
   DVLOG(1) << "Initialize()";
 
   video_size_ = config.coded_size;
@@ skipping 35 matching lines @@
   int y_stride = (width + kAlignment - 1) / kAlignment * kAlignment + kPadding;
   int uv_stride =
       (width / 2 + kAlignment - 1) / kAlignment * kAlignment + kPadding;
   int y_rows = height;
   int uv_rows = height / 2;
   int y_offset = 0;
   int v_offset = y_stride * y_rows + kPlanePadding;
   int u_offset = v_offset + uv_stride * uv_rows + kPlanePadding;
   int frame_size = u_offset + uv_stride * uv_rows + kPlanePadding;
 
-  decoded_frame->SetFrameBuffer(allocator_->Allocate(frame_size));
+  decoded_frame->SetFrameBuffer(host_->Allocate(frame_size));
   decoded_frame->FrameBuffer()->SetSize(frame_size);
 
   decoded_frame->SetFormat(cdm::kYv12);
   decoded_frame->SetSize(video_size_);
   decoded_frame->SetPlaneOffset(cdm::VideoFrame::kYPlane, y_offset);
   decoded_frame->SetPlaneOffset(cdm::VideoFrame::kVPlane, v_offset);
   decoded_frame->SetPlaneOffset(cdm::VideoFrame::kUPlane, u_offset);
   decoded_frame->SetStride(cdm::VideoFrame::kYPlane, y_stride);
   decoded_frame->SetStride(cdm::VideoFrame::kVPlane, uv_stride);
   decoded_frame->SetStride(cdm::VideoFrame::kUPlane, uv_stride);
   decoded_frame->SetTimestamp(timestamp);
 
   static unsigned char color = 0;
   color += 10;
 
   memset(reinterpret_cast<void*>(decoded_frame->FrameBuffer()->Data()),
          color, frame_size);
 
   return cdm::kSuccess;
 }
 
 }  // namespace webkit_media