Call close_timer_.Reset() from StopStreamTask.

media/audio/audio_output_proxy_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/message_loop.h"
 #include "base/threading/platform_thread.h"
 #include "media/audio/audio_output_dispatcher.h"
 #include "media/audio/audio_output_proxy.h"
 #include "media/audio/audio_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 67 matching lines @@
 
     // This is necessary to free all proxy objects that have been
     // closed by the test.
     message_loop_.RunAllPending();
   }
 
   void InitDispatcher(int close_delay_ms) {
     AudioParameters params(AudioParameters::AUDIO_PCM_LINEAR,
                            CHANNEL_LAYOUT_STEREO, 44100, 16, 1024);
     dispatcher_ = new AudioOutputDispatcher(&manager_, params, close_delay_ms);
+
+    // Necessary to know how long the dispatcher will wait before posting
+    // StopStreamTask.
+    pause_delay_milliseconds_ = dispatcher_->pause_delay_milliseconds_;
   }
 
   MessageLoop message_loop_;
   scoped_refptr<AudioOutputDispatcher> dispatcher_;
+  int64 pause_delay_milliseconds_;
   MockAudioManager manager_;
   MockAudioSourceCallback callback_;
 };
 
 TEST_F(AudioOutputProxyTest, CreateAndClose) {
   AudioOutputProxy* proxy = new AudioOutputProxy(dispatcher_);
   proxy->Close();
 }
 
 TEST_F(AudioOutputProxyTest, OpenAndClose) {
@@ skipping 78 matching lines @@
       .Times(1);
   EXPECT_CALL(stream, Close())
       .Times(1);
 
   AudioOutputProxy* proxy = new AudioOutputProxy(dispatcher_);
   EXPECT_TRUE(proxy->Open());
 
   proxy->Start(&callback_);
   proxy->Stop();
 
-  // Simulate a delay.
+  // Wait for StreamStopped to post StopStreamTask.

[Sergey Ulanov, 2011/11/23 19:12:18]

nit: StreamStopped() and StopStreamTask() to make it clear that they are
functions.

[Reid Kleckner (google), 2011/11/23 19:23:04]

Done.

+  base::PlatformThread::Sleep(pause_delay_milliseconds_ * 3);

[Sergey Ulanov, 2011/11/23 19:12:18]

I think sleeping pause_delay_milliseconds_ should be enough here. But you can
set it to "pause_delay_milliseconds_ * 2" just to be sure.

[Reid Kleckner (google), 2011/11/23 19:23:04]

Done.

   message_loop_.RunAllPending();
-  base::PlatformThread::Sleep(kTestCloseDelayMs * 10);
+
+  // Wait for the close timer to fire.
+  base::PlatformThread::Sleep(kTestCloseDelayMs * 3);

[Sergey Ulanov, 2011/11/23 19:12:18]

"*2" and can you please update two other tests that use Sleep()?

[Reid Kleckner (google), 2011/11/23 19:23:04]

Done.

   message_loop_.RunAllPending();
 
   // Verify expectation before calling Close().
   Mock::VerifyAndClear(&stream);
 
   proxy->Close();
 }
 
 // Create two streams, but don't start them. Only one device must be open.
 TEST_F(AudioOutputProxyTest, TwoStreams) {
@@ skipping 145 matching lines @@
 
   EXPECT_CALL(callback_, OnError(_, _))
       .Times(1);
 
   proxy->Start(&callback_);
 
   Mock::VerifyAndClear(&callback_);
 
   proxy->Close();
 }