Index: media/base/audio_renderer_mixer_unittest.cc |
diff --git a/media/base/audio_renderer_mixer_unittest.cc b/media/base/audio_renderer_mixer_unittest.cc |
index 589358357b5f131f5f79694508f9a48ae74d8995..857df2629e44b08372676f2a9b666b1a38fa18b6 100644 |
--- a/media/base/audio_renderer_mixer_unittest.cc |
+++ b/media/base/audio_renderer_mixer_unittest.cc |
@@ -51,8 +51,8 @@ class AudioRendererMixerTest |
std::tr1::get<1>(GetParam()), 16, kLowLatencyBufferSize); |
sink_ = new MockAudioRendererSink(); |
- EXPECT_CALL(*sink_.get(), Start()); |
- EXPECT_CALL(*sink_.get(), Stop()); |
+ EXPECT_CALL(*sink_, Start()); |
+ EXPECT_CALL(*sink_, Stop()); |
mixer_.reset(new AudioRendererMixer( |
input_parameters_, output_parameters_, sink_)); |
@@ -393,6 +393,20 @@ TEST_P(AudioRendererMixerBehavioralTest, OnRenderError) { |
mixer_inputs_[i]->Stop(); |
} |
+TEST_P(AudioRendererMixerBehavioralTest, OnRenderErrorPausedInput) { |
+ InitializeInputs(kMixerInputs); |
+ |
+ for (size_t i = 0; i < mixer_inputs_.size(); ++i) |
+ EXPECT_CALL(*fake_callbacks_[i], OnRenderError()).Times(1); |
+ |
+ // Fire the error before attaching any inputs. Ensure an error is recieved |
+ // even if the input is not connected. |
+ mixer_callback_->OnRenderError(); |
+ |
+ for (size_t i = 0; i < mixer_inputs_.size(); ++i) |
+ mixer_inputs_[i]->Stop(); |
+} |
+ |
// Ensure constructing an AudioRendererMixerInput, but not initializing it does |
// not call RemoveMixer(). |
TEST_P(AudioRendererMixerBehavioralTest, NoInitialize) { |