Generalize AesDecryptor to make it more spec compliant.

media/mp4/mp4_stream_parser.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/mp4/mp4_stream_parser.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/time.h"
 #include "media/base/audio_decoder_config.h"
@@ skipping 13 matching lines @@
       has_audio_(false),
       has_video_(false) {
 }
 
 MP4StreamParser::~MP4StreamParser() {}
 
 void MP4StreamParser::Init(const InitCB& init_cb,
                            const NewConfigCB& config_cb,
                            const NewBuffersCB& audio_cb,
                            const NewBuffersCB& video_cb,
-                           const KeyNeededCB& key_needed_cb,
+                           const NeedKeyCB& need_key_cb,
                            const NewMediaSegmentCB& new_segment_cb) {
   DCHECK_EQ(state_, kWaitingForInit);
   DCHECK(init_cb_.is_null());
   DCHECK(!init_cb.is_null());
   DCHECK(!config_cb.is_null());
   DCHECK(!audio_cb.is_null() || !video_cb.is_null());
-  DCHECK(!key_needed_cb.is_null());
+  DCHECK(!need_key_cb.is_null());
 
   ChangeState(kParsingBoxes);
   init_cb_ = init_cb;
   config_cb_ = config_cb;
   audio_cb_ = audio_cb;
   video_cb_ = video_cb;
-  key_needed_cb_ = key_needed_cb;
+  need_key_cb_ = need_key_cb;
   new_segment_cb_ = new_segment_cb;
 }
 
 void MP4StreamParser::Flush() {
   DCHECK_NE(state_, kWaitingForInit);
 
   queue_.Reset();
   moof_head_ = 0;
   mdat_tail_ = 0;
 }
@@ skipping 273 matching lines @@
   return true;
 }
 
 void MP4StreamParser::ChangeState(State new_state) {
   DVLOG(2) << "Changing state: " << new_state;
   state_ = new_state;
 }
 
 }  // namespace mp4
 }  // namespace media