Consolidate and improve audio decoding test for all decoders.

media/filters/audio_file_reader.h

Index: media/filters/audio_file_reader.h
diff --git a/media/filters/audio_file_reader.h b/media/filters/audio_file_reader.h
index e7b7b4b71f8af84af71ba7e3ef38d6f1517eeaa1..c700b3288fcb33a842c860a0b98344ba999069f3 100644
--- a/media/filters/audio_file_reader.h
+++ b/media/filters/audio_file_reader.h
@@ -8,16 +8,17 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/media_export.h"
+#include "media/filters/ffmpeg_glue.h"
 
 struct AVCodecContext;
 struct AVPacket;
+struct AVStream;
 
 namespace base { class TimeDelta; }
 
 namespace media {
 
 class AudioBus;
-class FFmpegGlue;
 class FFmpegURLProtocol;
 
 class MEDIA_EXPORT AudioFileReader {
@@ -55,17 +56,29 @@ class MEDIA_EXPORT AudioFileReader {
   base::TimeDelta GetDuration() const;
   int GetNumberOfFrames() const;
 
-  // Helper methods which allows AudioFileReader to double as a test utility for
-  // demuxing audio files.  Returns true if a packet could be demuxed from the
-  // first audio stream in the file, |output_packet| will contain the demuxed
-  // packet then.
+  // The methods below are helper methods which allow AudioFileReader to double
+  // as a test utility for demuxing audio files.
+  // --------------------------------------------------------------------------
+
+  // Similar to Open() but does not initialize the decoder.
+  bool OpenDemuxerForTesting();
+
+  // Returns true if a packet could be demuxed from the first audio stream in
+  // the file, |output_packet| will contain the demuxed packet then.
   bool ReadPacketForTesting(AVPacket* output_packet);
 
+  // Seeks to the given point and returns true if successful.  |seek_time| will
+  // be converted to the stream's time base automatically.
+  bool SeekForTesting(base::TimeDelta seek_time);
+
+  const AVStream* GetAVStreamForTesting() const;
   const AVCodecContext* codec_context_for_testing() const {
     return codec_context_;
   }
 
  private:
+  bool OpenDemuxer();
+  bool OpenDecoder();
   bool ReadPacket(AVPacket* output_packet);
 
   scoped_ptr<FFmpegGlue> glue_;