Clean-up and bug fixes in AudioOutputController:

media/audio/audio_output_controller_unittest.cc

 // Copyright (c) 2012 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/basictypes.h"
 #include "base/bind.h"
 #include "base/environment.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 153 matching lines @@
     EXPECT_CALL(mock_event_handler_, OnPaused(NotNull()))
         .Times(0);
 
     // Simulate a device change event to AudioOutputController from the
     // AudioManager.
     audio_manager_->GetMessageLoop()->PostTask(
         FROM_HERE,
         base::Bind(&AudioOutputController::OnDeviceChange, controller_));
   }
 
-  void Divert(bool was_playing, bool will_be_playing) {
+  void Divert(bool was_playing, int num_times_to_be_started) {
     if (was_playing) {
       // Expect the handler to receive one OnPlaying() call as a result of the
       // stream switching.
       EXPECT_CALL(mock_event_handler_, OnPlaying(NotNull()))
           .WillOnce(SignalEvent(&play_event_));
     }
 
     EXPECT_CALL(mock_stream_, Open())
         .WillOnce(Return(true));
     EXPECT_CALL(mock_stream_, SetVolume(kTestVolume));
-    if (will_be_playing) {
+    if (num_times_to_be_started > 0) {
       EXPECT_CALL(mock_stream_, Start(NotNull()))
-          .Times(AtLeast(1))
+          .Times(num_times_to_be_started)
           .WillRepeatedly(
               Invoke(&mock_stream_, &MockAudioOutputStream::SetCallback));
+      EXPECT_CALL(mock_stream_, Stop())
+          .Times(num_times_to_be_started);
     }
-    // Always expect a Stop() call--even without a Start() call--since
-    // AudioOutputController likes to play it safe and Stop() before any
-    // Close().
-    EXPECT_CALL(mock_stream_, Stop())
-        .Times(AtLeast(1));
 
     controller_->StartDiverting(&mock_stream_);
   }
 
   void ReadDivertedAudioData() {
     scoped_ptr<AudioBus> dest = AudioBus::Create(params_);
     ASSERT_TRUE(!!mock_stream_.callback());
     const int frames_read =
         mock_stream_.callback()->OnMoreData(dest.get(), AudioBuffersState());
     EXPECT_LT(0, frames_read);
@@ skipping 14 matching lines @@
   }
 
   void Close() {
     EXPECT_CALL(mock_sync_reader_, Close());
 
     controller_->Close(MessageLoop::QuitClosure());
     MessageLoop::current()->Run();
   }
 
   // These help make test sequences more readable.
-  void DivertNeverPlaying() { Divert(false, false); }
-  void DivertWillEventuallyBePlaying() { Divert(false, true); }
-  void DivertWhilePlaying() { Divert(true, true); }
+  void DivertNeverPlaying() { Divert(false, 0); }
+  void DivertWillEventuallyBeTwicePlayed() { Divert(false, 2); }
+  void DivertWhilePlaying() { Divert(true, 1); }
   void RevertWasNotPlaying() { Revert(false); }
   void RevertWhilePlaying() { Revert(true); }
 
   // These synchronize the main thread with key events taking place on other
   // threads.
   void WaitForCreate() { create_event_.Wait(); }
   void WaitForPlay() { play_event_.Wait(); }
   void WaitForReads() {
     // Note: Arbitrarily chosen, but more iterations causes tests to take
     // significantly more time.
@@ skipping 106 matching lines @@
   ReadDivertedAudioData();
   RevertWhilePlaying();
   WaitForPlay();
   WaitForReads();
   Close();
 }
 
 TEST_F(AudioOutputControllerTest, DivertPlayPausePlayRevertClose) {
   Create(kSamplesPerPacket);
   WaitForCreate();
-  DivertWillEventuallyBePlaying();
+  DivertWillEventuallyBeTwicePlayed();
   Play();
   WaitForPlay();
   ReadDivertedAudioData();
   Pause();
   WaitForPause();
   Play();
   WaitForPlay();
   ReadDivertedAudioData();
   RevertWhilePlaying();
   WaitForPlay();
   WaitForReads();
   Close();
 }
 
 TEST_F(AudioOutputControllerTest, DivertRevertClose) {
   Create(kSamplesPerPacket);
   WaitForCreate();
   DivertNeverPlaying();
   RevertWasNotPlaying();
   Close();
 }
 
 }  // namespace media