Add AudioBufferStream.

media/filters/audio_renderer_impl_unittest.cc

Index: media/filters/audio_renderer_impl_unittest.cc
diff --git a/media/filters/audio_renderer_impl_unittest.cc b/media/filters/audio_renderer_impl_unittest.cc
index 21bc3dcb34afc814a1a5999ec12ea5a0679b82c7..5d8a20dac52bc2c2657279f49873ef410b0a9097 100644
--- a/media/filters/audio_renderer_impl_unittest.cc
+++ b/media/filters/audio_renderer_impl_unittest.cc
@@ -60,8 +60,8 @@ class AudioRendererImplTest : public ::testing::Test {
     demuxer_stream_.set_audio_decoder_config(audio_config);
 
     // Used to save callbacks and run them at a later time.
-    EXPECT_CALL(*decoder_, Read(_))
-        .WillRepeatedly(Invoke(this, &AudioRendererImplTest::ReadDecoder));
+    EXPECT_CALL(*decoder_, Decode(_, _))
+        .WillRepeatedly(Invoke(this, &AudioRendererImplTest::DecodeDecoder));
 
     EXPECT_CALL(*decoder_, Reset(_))
         .WillRepeatedly(Invoke(this, &AudioRendererImplTest::ResetDecoder));
@@ -77,6 +77,10 @@ class AudioRendererImplTest : public ::testing::Test {
     EXPECT_CALL(*decoder_, samples_per_second())
         .WillRepeatedly(Return(audio_config.samples_per_second()));
 
+    // Mock out demuxer reads
+    EXPECT_CALL(demuxer_stream_, Read(_)).WillRepeatedly(
+        Invoke(this, &AudioRendererImplTest::ReadDemuxerStream));
+
     ScopedVector<AudioDecoder> decoders;
     decoders.push_back(decoder_);
     sink_ = new FakeAudioRendererSink();
@@ -101,7 +105,7 @@ class AudioRendererImplTest : public ::testing::Test {
   }
 
   void ExpectUnsupportedAudioDecoder() {
-    EXPECT_CALL(*decoder_, Initialize(_, _, _))
+    EXPECT_CALL(*decoder_, Initialize(_, _))
         .WillOnce(RunCallback<1>(DECODER_ERROR_NOT_SUPPORTED));
   }
 
@@ -112,11 +116,11 @@ class AudioRendererImplTest : public ::testing::Test {
         .WillRepeatedly(Return(CHANNEL_LAYOUT_UNSUPPORTED));
     EXPECT_CALL(*decoder_, samples_per_second())
         .WillRepeatedly(Return(0));
-    EXPECT_CALL(*decoder_, Initialize(_, _, _))
+    EXPECT_CALL(*decoder_, Initialize(_, _))
         .WillOnce(RunCallback<1>(PIPELINE_OK));
   }
 
-  MOCK_METHOD1(OnStatistics, void(const PipelineStatistics&));
+  void OnStatistics(const PipelineStatistics& statistics) {}

[DaleCurtis, 2014/02/21 21:48:48]

Why?

[rileya (GONE FROM CHROMIUM), 2014/02/21 23:04:02]

I think I was getting uninteresting mock warnings and that was my lazy way of
shutting it up. Previously it never got called because the decoder was mocked
(whereas now the AudioBuferStream reports statistics and isn't mocked (it
probably should be now though)).

   MOCK_METHOD0(OnUnderflow, void());
   MOCK_METHOD0(OnDisabled, void());
   MOCK_METHOD1(OnError, void(PipelineStatus));
@@ -126,7 +130,7 @@ class AudioRendererImplTest : public ::testing::Test {
   }
 
   void Initialize() {
-    EXPECT_CALL(*decoder_, Initialize(_, _, _))
+    EXPECT_CALL(*decoder_, Initialize(_, _))
         .WillOnce(RunCallback<1>(PIPELINE_OK));
     InitializeWithStatus(PIPELINE_OK);
 
@@ -403,15 +407,21 @@ class AudioRendererImplTest : public ::testing::Test {
     return time_;
   }
 
-  void ReadDecoder(const AudioDecoder::ReadCB& read_cb) {
+  void ReadDemuxerStream(const DemuxerStream::ReadCB& read_cb) {
+    scoped_refptr<DecoderBuffer> buffer = new DecoderBuffer(8);

[DaleCurtis, 2014/02/21 21:48:48]

Seems like this would just cause decoder errors.  Just return an EOS buffer like
the VRI test?

[rileya (GONE FROM CHROMIUM), 2014/02/21 23:04:02]

This was another quick hack to make things compile that I forgot to clean up,
sounds good.

[rileya (GONE FROM CHROMIUM), 2014/02/24 21:04:11]

Fixed.

+    read_cb.Run(DemuxerStream::kOk, buffer);
+  }
+
+  void DecodeDecoder(const scoped_refptr<DecoderBuffer>& buffer,
+                     const AudioDecoder::DecodeCB& read_cb) {
     // We shouldn't ever call Read() after Stop():
     EXPECT_TRUE(stop_decoder_cb_.is_null());
 
     // TODO(scherkus): Make this a DCHECK after threading semantics are fixed.
     if (base::MessageLoop::current() != &message_loop_) {
       message_loop_.PostTask(FROM_HERE, base::Bind(
-          &AudioRendererImplTest::ReadDecoder,
-          base::Unretained(this), read_cb));
+          &AudioRendererImplTest::DecodeDecoder,
+          base::Unretained(this), buffer, read_cb));
       return;
     }
 
@@ -452,12 +462,12 @@ class AudioRendererImplTest : public ::testing::Test {
   TimeTicks time_;
 
   // Used for satisfying reads.
-  AudioDecoder::ReadCB read_cb_;
+  AudioDecoder::DecodeCB read_cb_;
   scoped_ptr<AudioTimestampHelper> next_timestamp_;
 
   WaitableMessageLoopEvent ended_event_;
 
-  // Run during ReadDecoder() to unblock WaitForPendingRead().
+  // Run during DecodeDecoder() to unblock WaitForPendingRead().
   base::Closure wait_for_pending_read_cb_;
 
   base::Closure stop_decoder_cb_;