Generalize AesDecryptor to make it more spec compliant.

media/webm/webm_stream_parser.h

 // 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.
 
 #ifndef MEDIA_WEBM_WEBM_STREAM_PARSER_H_
 #define MEDIA_WEBM_WEBM_STREAM_PARSER_H_
 
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/buffers.h"
 #include "media/base/byte_queue.h"
 #include "media/base/stream_parser.h"
 #include "media/base/video_decoder_config.h"
 #include "media/webm/webm_cluster_parser.h"
 
 namespace media {
 
 class WebMStreamParser : public StreamParser {
  public:
   WebMStreamParser();
   virtual ~WebMStreamParser();
 
   // StreamParser implementation.
   virtual void 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) OVERRIDE;
   virtual void Flush() OVERRIDE;
   virtual bool Parse(const uint8* buf, int size) OVERRIDE;
 
  private:
   enum State {
     kWaitingForInit,
     kParsingHeaders,
     kParsingClusters,
     kError
@@ skipping 18 matching lines @@
   // Returns < 0 if the parse fails.
   // Returns 0 if more data is needed.
   // Returning > 0 indicates success & the number of bytes parsed.
   int ParseCluster(const uint8* data, int size);
 
   State state_;
   InitCB init_cb_;
   NewConfigCB config_cb_;
   NewBuffersCB audio_cb_;
   NewBuffersCB video_cb_;
-  KeyNeededCB key_needed_cb_;
+  NeedKeyCB need_key_cb_;
   NewMediaSegmentCB new_segment_cb_;
 
   // True if a new cluster id has been seen, but no audio or video buffers have
   // been parsed yet.
   bool waiting_for_buffers_;
 
   scoped_ptr<WebMClusterParser> cluster_parser_;
   ByteQueue byte_queue_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMStreamParser);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_WEBM_WEBM_STREAM_PARSER_H_