Generalize AesDecryptor to make it more spec compliant.

media/filters/chunk_demuxer.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 "media/filters/chunk_demuxer.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "media/base/audio_decoder_config.h"
@@ skipping 588 matching lines @@
 
   scoped_ptr<StreamParser> stream_parser(factory_function());
   CHECK(stream_parser.get());
 
   stream_parser->Init(
       base::Bind(&ChunkDemuxer::OnStreamParserInitDone, this),
       base::Bind(&ChunkDemuxer::OnNewConfigs, base::Unretained(this),
                  has_audio, has_video),
       audio_cb,
       video_cb,
-      base::Bind(&ChunkDemuxer::OnKeyNeeded, base::Unretained(this)),
+      base::Bind(&ChunkDemuxer::OnNeedKey, base::Unretained(this)),
       base::Bind(&ChunkDemuxer::OnNewMediaSegment, base::Unretained(this), id));
 
   stream_parser_map_[id] = stream_parser.release();
 
   return kOk;
 }
 
 void ChunkDemuxer::RemoveId(const std::string& id) {
   CHECK_GT(stream_parser_map_.count(id), 0u);
   base::AutoLock auto_lock(lock_);
@@ skipping 391 matching lines @@
 
 bool ChunkDemuxer::OnVideoBuffers(const StreamParser::BufferQueue& buffers) {
   DCHECK_NE(state_, SHUTDOWN);
 
   if (!video_)
     return false;
 
   return video_->Append(buffers);
 }
 
-bool ChunkDemuxer::OnKeyNeeded(scoped_array<uint8> init_data,
-                               int init_data_size) {
-  client_->KeyNeeded(init_data.Pass(), init_data_size);
+bool ChunkDemuxer::OnNeedKey(scoped_array<uint8> init_data,
+                             int init_data_size) {
+  client_->DemuxerNeedKey(init_data.Pass(), init_data_size);
   return true;
 }
 
 void ChunkDemuxer::OnNewMediaSegment(const std::string& source_id,
                                      base::TimeDelta start_timestamp) {
   // TODO(vrk): There should be a special case for the first appends where all
   // streams (for both demuxed and muxed case) begin at the earliest stream
   // timestamp. (crbug.com/132815)
   if (audio_ && source_id == source_id_audio_)
     audio_->OnNewMediaSegment(start_timestamp);
   if (video_ && source_id == source_id_video_)
     video_->OnNewMediaSegment(start_timestamp);
 }
 
 }  // namespace media