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

webkit/media/crypto/ppapi/ffmpeg_cdm_audio_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/ffmpeg_cdm_audio_decoder.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "media/base/audio_bus.h"
@@ skipping 62 matching lines @@
     memcpy(codec_context->extradata, config.extra_data,
            config.extra_data_size);
     memset(codec_context->extradata + config.extra_data_size, '\0',
            FF_INPUT_BUFFER_PADDING_SIZE);
   } else {
     codec_context->extradata = NULL;
     codec_context->extradata_size = 0;
   }
 }
 
-FFmpegCdmAudioDecoder::FFmpegCdmAudioDecoder(cdm::Allocator* allocator)
+FFmpegCdmAudioDecoder::FFmpegCdmAudioDecoder(cdm::Host* host)
     : is_initialized_(false),
-      allocator_(allocator),
+      host_(host),
       codec_context_(NULL),
       av_frame_(NULL),
       bits_per_channel_(0),
       samples_per_second_(0),
       bytes_per_frame_(0),
       last_input_timestamp_(media::kNoTimestamp()),
       output_bytes_to_drop_(0) {
 }
 
 FFmpegCdmAudioDecoder::~FFmpegCdmAudioDecoder() {
@@ skipping 248 matching lines @@
       SerializeInt64(output->GetDataSize());
       serialized_audio_frames_.insert(
           serialized_audio_frames_.end(),
           output->GetData(),
           output->GetData() + output->GetDataSize());
     }
   } while (packet.size > 0);
 
   if (!serialized_audio_frames_.empty()) {
     decoded_frames->SetFrameBuffer(
-        allocator_->Allocate(serialized_audio_frames_.size()));
+        host_->Allocate(serialized_audio_frames_.size()));
     if (!decoded_frames->FrameBuffer()) {
-      LOG(ERROR) << "DecodeBuffer() cdm::Allocator::Allocate failed.";
+      LOG(ERROR) << "DecodeBuffer() cdm::Host::Allocate failed.";
       return cdm::kDecodeError;
     }
     memcpy(decoded_frames->FrameBuffer()->Data(),
            &serialized_audio_frames_[0],
            serialized_audio_frames_.size());
     decoded_frames->FrameBuffer()->SetSize(serialized_audio_frames_.size());
     serialized_audio_frames_.clear();
 
     return cdm::kSuccess;
   }
@@ skipping 22 matching lines @@
   }
 }
 
 void FFmpegCdmAudioDecoder::SerializeInt64(int64 value) {
   int previous_size = serialized_audio_frames_.size();
   serialized_audio_frames_.resize(previous_size + sizeof(value));
   memcpy(&serialized_audio_frames_[0] + previous_size, &value, sizeof(value));
 }
 
 }  // namespace webkit_media