| Index: webkit/media/filter_helpers.cc
 | 
| diff --git a/webkit/media/filter_helpers.cc b/webkit/media/filter_helpers.cc
 | 
| index 075ea09d3babad8909ee385a94b2b94e84e082e6..9eaef4bdb61ce7b7fc55bb7608570cbeb77ec035 100644
 | 
| --- a/webkit/media/filter_helpers.cc
 | 
| +++ b/webkit/media/filter_helpers.cc
 | 
| @@ -21,7 +21,7 @@ namespace webkit_media {
 | 
|  static void AddDefaultDecodersToCollection(
 | 
|      media::MessageLoopFactory* message_loop_factory,
 | 
|      media::FilterCollection* filter_collection,
 | 
| -    media::AesDecryptor* decryptor,
 | 
| +    media::Decryptor* decryptor,
 | 
|      scoped_refptr<media::FFmpegVideoDecoder>* ffmpeg_video_decoder) {
 | 
|    filter_collection->AddAudioDecoder(new media::FFmpegAudioDecoder(
 | 
|        base::Bind(&media::MessageLoopFactory::GetMessageLoop,
 | 
| @@ -69,7 +69,7 @@ bool BuildMediaSourceCollection(
 | 
|      media::ChunkDemuxerClient* client,
 | 
|      media::MessageLoopFactory* message_loop_factory,
 | 
|      media::FilterCollection* filter_collection,
 | 
| -    media::AesDecryptor* decryptor,
 | 
| +    media::Decryptor* decryptor,
 | 
|      scoped_refptr<media::FFmpegVideoDecoder>* video_decoder) {
 | 
|    if (media_source_url.isEmpty() || url != media_source_url)
 | 
|      return false;
 | 
| @@ -85,7 +85,7 @@ void BuildDefaultCollection(
 | 
|      const scoped_refptr<media::DataSource>& data_source,
 | 
|      media::MessageLoopFactory* message_loop_factory,
 | 
|      media::FilterCollection* filter_collection,
 | 
| -    media::AesDecryptor* decryptor,
 | 
| +    media::Decryptor* decryptor,
 | 
|      scoped_refptr<media::FFmpegVideoDecoder>* video_decoder) {
 | 
|    filter_collection->SetDemuxer(new media::FFmpegDemuxer(
 | 
|        message_loop_factory->GetMessageLoop("PipelineThread"),
 | 
| 
 |