Introduce AudioDecoderConfig to migrate away from GetAVStream().

media/filters/chunk_demuxer_unittest.cc

 // Copyright (c) 2011 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 "base/bind.h"
+#include "media/base/audio_decoder_config.h"
 #include "media/base/mock_callback.h"
 #include "media/base/mock_filter_host.h"
 #include "media/base/test_data_util.h"
 #include "media/filters/chunk_demuxer.h"
 #include "media/filters/chunk_demuxer_client.h"
 #include "media/webm/cluster_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::AnyNumber;
 using ::testing::InSequence;
@@ skipping 162 matching lines @@
 
 TEST_F(ChunkDemuxerTest, TestInit) {
   // Test no streams, audio-only, video-only, and audio & video scenarios.
   for (int i = 0; i < 4; i++) {
     bool has_audio = (i & 0x1) != 0;
     bool has_video = (i & 0x2) != 0;
 
     client_.reset(new MockChunkDemuxerClient());
     demuxer_ = new ChunkDemuxer(client_.get());
     InitDemuxer(has_audio, has_video);
-    EXPECT_EQ(demuxer_->GetStream(DemuxerStream::AUDIO).get() != NULL,
-              has_audio);
-    EXPECT_EQ(demuxer_->GetStream(DemuxerStream::VIDEO).get() != NULL,
-              has_video);
+
+    scoped_refptr<DemuxerStream> audio_stream =
+        demuxer_->GetStream(DemuxerStream::AUDIO);
+    if (has_audio) {
+      EXPECT_TRUE(audio_stream);
+
+      const AudioDecoderConfig& config = audio_stream->audio_decoder_config();
+      EXPECT_EQ(kCodecVorbis, config.codec());
+      EXPECT_EQ(16, config.bits_per_channel());
+      EXPECT_EQ(CHANNEL_LAYOUT_STEREO, config.channel_layout());
+      EXPECT_EQ(44100, config.samples_per_second());
+      EXPECT_TRUE(config.extra_data());
+      EXPECT_GT(config.extra_data_size(), 0u);
+    } else {
+      EXPECT_FALSE(audio_stream);
+    }
+
+    scoped_refptr<DemuxerStream> video_stream =
+        demuxer_->GetStream(DemuxerStream::VIDEO);
+    if (has_video) {
+      EXPECT_TRUE(video_stream);
+    } else {
+      EXPECT_FALSE(video_stream);
+    }
+
     ShutdownDemuxer();
     demuxer_ = NULL;
   }
 }
 
-// Makes sure that  Seek() reports an error if Shutdown()
+// Makes sure that Seek() reports an error if Shutdown()
 // is called before the first cluster is passed to the demuxer.
 TEST_F(ChunkDemuxerTest, TestShutdownBeforeFirstSeekCompletes) {
   InitDemuxer(true, true);
 
   demuxer_->Seek(base::TimeDelta::FromSeconds(0),
                  NewExpectedStatusCB(PIPELINE_ERROR_ABORT));
 }
 
 // Test that Seek() completes successfully when the first cluster
 // arrives.
@@ skipping 393 matching lines @@
   // Request a few more reads and make sure we immediately get
   // end of stream buffers.
   end_of_stream_helper_2.RequestReads();
   end_of_stream_helper_2.CheckIfReadDonesWereCalled(true);
 
   end_of_stream_helper_3.RequestReads();
   end_of_stream_helper_3.CheckIfReadDonesWereCalled(true);
 }
 
 }  // namespace media