Guard against midstream audio configuration changes.

media/filters/audio_file_reader_unittest.cc

Index: media/filters/audio_file_reader_unittest.cc
diff --git a/media/filters/audio_file_reader_unittest.cc b/media/filters/audio_file_reader_unittest.cc
index 72c26038f3e239bb6244e7bf48dc1302fd68b1c4..84a8bb2d835bf1b9dcadb08d10df40babaae1899 100644
--- a/media/filters/audio_file_reader_unittest.cc
+++ b/media/filters/audio_file_reader_unittest.cc
@@ -73,11 +73,19 @@ class AudioFileReaderTest : public testing::Test {
     ReadAndVerify(hash, trimmed_frames);
   }
 
-  void RunFailingTest(const char* fn) {
+  void RunTestFailingDemux(const char* fn) {
     Initialize(fn);
     EXPECT_FALSE(reader_->Open());
   }
 
+  void RunTestFailingDecode(const char* fn) {
+    Initialize(fn);
+    EXPECT_TRUE(reader_->Open());
+    scoped_ptr<AudioBus> decoded_audio_data = AudioBus::Create(
+        reader_->channels(), reader_->number_of_frames());
+    EXPECT_EQ(reader_->Read(decoded_audio_data.get()), 0);
+  }
+
  protected:
   scoped_refptr<DecoderBuffer> data_;
   scoped_ptr<InMemoryUrlProtocol> protocol_;
@@ -91,7 +99,7 @@ TEST_F(AudioFileReaderTest, WithoutOpen) {
 }
 
 TEST_F(AudioFileReaderTest, InvalidFile) {
-  RunFailingTest("ten_byte_file");
+  RunTestFailingDemux("ten_byte_file");
 }
 
 TEST_F(AudioFileReaderTest, WithVideo) {
@@ -137,7 +145,7 @@ TEST_F(AudioFileReaderTest, AAC) {
 #endif
 
 TEST_F(AudioFileReaderTest, VorbisInvalidChannelLayout) {
-  RunFailingTest("9ch.ogg");
+  RunTestFailingDemux("9ch.ogg");
 }
 
 TEST_F(AudioFileReaderTest, WaveValidFourChannelLayout) {
@@ -145,4 +153,8 @@ TEST_F(AudioFileReaderTest, WaveValidFourChannelLayout) {
           base::TimeDelta::FromMicroseconds(100001), 4410, 4410);
 }
 
+TEST_F(AudioFileReaderTest, MidStreamConfigChangesFail) {
+  RunTestFailingDecode("midstream_config_change.mp3");

[scherkus (not reviewing), 2013/02/12 02:16:56]

mp3s will fail for chromium

[DaleCurtis, 2013/02/12 02:41:24]

Whoops, supposed to be in the #if block.

+}
+
 }  // namespace media