Allow AudioRendererMixerInput::Stop() to be called anytime.

BUG=157710
TEST=new unittest

Review URL: https://codereview.chromium.org/11270025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164373 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 17 insertions, 3 deletions

diff --git a/media/base/audio_renderer_mixer_input_unittest.cc b/media/base/audio_renderer_mixer_input_unittest.cc
index 48b2232..a3cb3bc 100644
--- a/media/base/audio_renderer_mixer_input_unittest.cc
+++ b/media/base/audio_renderer_mixer_input_unittest.cc
@@ -25,14 +25,18 @@ class AudioRendererMixerInputTest : public testing::Test {
         AudioParameters::AUDIO_PCM_LINEAR, kChannelLayout, kSampleRate,
         kBitsPerChannel, kBufferSize);
 
+    CreateMixerInput();
+    fake_callback_.reset(new FakeAudioRenderCallback(0));
+    mixer_input_->Initialize(audio_parameters_, fake_callback_.get());
+    EXPECT_CALL(*this, RemoveMixer(testing::_));
+  }
+
+  void CreateMixerInput() {
     mixer_input_ = new AudioRendererMixerInput(
         base::Bind(
             &AudioRendererMixerInputTest::GetMixer, base::Unretained(this)),
         base::Bind(
             &AudioRendererMixerInputTest::RemoveMixer, base::Unretained(this)));
-    fake_callback_.reset(new FakeAudioRenderCallback(0));
-    mixer_input_->Initialize(audio_parameters_, fake_callback_.get());
-    EXPECT_CALL(*this, RemoveMixer(testing::_));
   }
 
   AudioRendererMixer* GetMixer(const AudioParameters& params) {
@@ -94,4 +98,14 @@ TEST_F(AudioRendererMixerInputTest, StartPlayPauseStopPlaying) {
   EXPECT_FALSE(mixer_input_->playing());
 }
 
+// Test that Stop() can be called before Initialize() and Start().
+TEST_F(AudioRendererMixerInputTest, StopBeforeInitializeOrStart) {
+  // |mixer_input_| was initialized during construction.
+  mixer_input_->Stop();
+
+  // Verify Stop() works without Initialize() or Start().
+  CreateMixerInput();
+  mixer_input_->Stop();
+}
+
 }  // namespace media