Generalize AesDecryptor to make it more spec compliant.

media/webm/webm_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/webm/webm_stream_parser.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/filters/ffmpeg_glue.h"
@@ skipping 172 matching lines @@
 WebMStreamParser::WebMStreamParser()
     : state_(kWaitingForInit) {
 }
 
 WebMStreamParser::~WebMStreamParser() {}
 
 void WebMStreamParser::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) {
   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(kParsingHeaders);
   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;
 }
 
 void WebMStreamParser::Flush() {
   DCHECK_NE(state_, kWaitingForInit);
 
   byte_queue_.Reset();
 
   if (state_ != kParsingClusters)
     return;
 
@@ skipping 119 matching lines @@
     return -1;
 
   config_cb_.Run(config_helper.audio_config(),config_helper.video_config());
 
   // TODO(xhwang): Support decryption of audio (see http://crbug.com/123421).
   if (tracks_parser.video_encryption_key_id()) {
     int key_id_size = tracks_parser.video_encryption_key_id_size();
     CHECK_GT(key_id_size, 0);
     scoped_array<uint8> key_id(new uint8[key_id_size]);
     memcpy(key_id.get(), tracks_parser.video_encryption_key_id(), key_id_size);
-    key_needed_cb_.Run(key_id.Pass(), key_id_size);
+    need_key_cb_.Run(key_id.Pass(), key_id_size);
   }
 
   cluster_parser_.reset(new WebMClusterParser(
       info_parser.timecode_scale(),
       tracks_parser.audio_track_num(),
       tracks_parser.video_track_num(),
       tracks_parser.video_encryption_key_id(),
       tracks_parser.video_encryption_key_id_size()));
 
   ChangeState(kParsingClusters);
@@ skipping 34 matching lines @@
   if (!audio_buffers.empty() && !audio_cb_.Run(audio_buffers))
     return -1;
 
   if (!video_buffers.empty() && !video_cb_.Run(video_buffers))
     return -1;
 
   return bytes_parsed;
 }
 
 }  // namespace media