Added initial muted state to stream creation callback, to avoid races.

media/audio/audio_input_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 "media/audio/audio_input_controller.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 43 matching lines @@
 static void CloseAudioController(AudioInputController* controller) {
   controller->Close(base::MessageLoop::QuitWhenIdleClosure());
   base::RunLoop().Run();
 }
 
 class MockAudioInputControllerEventHandler
     : public AudioInputController::EventHandler {
  public:
   MockAudioInputControllerEventHandler() {}
 
-  MOCK_METHOD1(OnCreated, void(AudioInputController* controller));
+  MOCK_METHOD2(OnCreated,
+               void(AudioInputController* controller, bool initially_muted));
   MOCK_METHOD2(OnError, void(AudioInputController* controller,
                              AudioInputController::ErrorCode error_code));
   MOCK_METHOD2(OnLog,
                void(AudioInputController* controller,
                     const std::string& message));
   MOCK_METHOD2(OnMuted, void(AudioInputController* controller, bool is_muted));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockAudioInputControllerEventHandler);
 };
@@ skipping 54 matching lines @@
   scoped_refptr<AudioInputController> controller;
 
   AudioParameters params(AudioParameters::AUDIO_FAKE, kChannelLayout,
                          kSampleRate, kBitsPerSample, kSamplesPerPacket);
 
   SuspendAudioThread();
   controller = AudioInputController::Create(
       audio_manager_.get(), &event_handler, &sync_writer, nullptr, params,
       AudioDeviceDescription::kDefaultDeviceId, false);
   ASSERT_TRUE(controller.get());
-  EXPECT_CALL(event_handler, OnCreated(controller.get())).Times(Exactly(1));
+  EXPECT_CALL(event_handler, OnCreated(controller.get(), _)).Times(Exactly(1));
   EXPECT_CALL(event_handler, OnLog(controller.get(), _)).Times(Exactly(3));
   EXPECT_CALL(sync_writer, Close()).Times(Exactly(1));
   ResumeAudioThread();
 
   CloseAudioController(controller.get());
 }
 
 // Test a normal call sequence of create, record and close.
 TEST_F(AudioInputControllerTest, RecordAndClose) {
   MockAudioInputControllerEventHandler event_handler;
   MockSyncWriter sync_writer;
   int count = 0;
 
   // OnCreated() will be called once.
-  EXPECT_CALL(event_handler, OnCreated(NotNull()))
+  EXPECT_CALL(event_handler, OnCreated(NotNull(), _))
       .Times(Exactly(1));
 
   // Write() should be called ten times.
   EXPECT_CALL(sync_writer, Write(NotNull(), _, _, _))
       .Times(AtLeast(10))
       .WillRepeatedly(
           CheckCountAndPostQuitTask(&count, 10, message_loop_.task_runner()));
 
   EXPECT_CALL(event_handler, OnLog(_, _)).Times(AnyNumber());
   EXPECT_CALL(sync_writer, Close()).Times(Exactly(1));
@@ skipping 14 matching lines @@
   CloseAudioController(controller.get());
 }
 
 // Test that AudioInputController rejects insanely large packet sizes.
 TEST_F(AudioInputControllerTest, SamplesPerPacketTooLarge) {
   // Create an audio device with a very large packet size.
   MockAudioInputControllerEventHandler event_handler;
   MockSyncWriter sync_writer;
 
   // OnCreated() shall not be called in this test.
-  EXPECT_CALL(event_handler, OnCreated(NotNull())).Times(Exactly(0));
+  EXPECT_CALL(event_handler, OnCreated(NotNull(), _)).Times(Exactly(0));
 
   AudioParameters params(AudioParameters::AUDIO_FAKE,
                          kChannelLayout,
                          kSampleRate,
                          kBitsPerSample,
                          kSamplesPerPacket * 1000);
   scoped_refptr<AudioInputController> controller = AudioInputController::Create(
       audio_manager_.get(), &event_handler, &sync_writer, nullptr, params,
       AudioDeviceDescription::kDefaultDeviceId, false);
   ASSERT_FALSE(controller.get());
 }
 
 // Test calling AudioInputController::Close multiple times.
 TEST_F(AudioInputControllerTest, CloseTwice) {
   MockAudioInputControllerEventHandler event_handler;
   MockSyncWriter sync_writer;
 
   // OnCreated() will be called only once.
-  EXPECT_CALL(event_handler, OnCreated(NotNull())).Times(Exactly(1));
+  EXPECT_CALL(event_handler, OnCreated(NotNull(), _)).Times(Exactly(1));
   EXPECT_CALL(event_handler, OnLog(_, _)).Times(AnyNumber());
   // This callback should still only be called once.
   EXPECT_CALL(sync_writer, Close()).Times(Exactly(1));
 
   AudioParameters params(AudioParameters::AUDIO_FAKE,
                          kChannelLayout,
                          kSampleRate,
                          kBitsPerSample,
                          kSamplesPerPacket);
   scoped_refptr<AudioInputController> controller = AudioInputController::Create(
@@ skipping 26 matching lines @@
   scoped_refptr<AudioInputController> controller;
   WaitableEvent callback_event(WaitableEvent::ResetPolicy::AUTOMATIC,
                                WaitableEvent::InitialState::NOT_SIGNALED);
 
   AudioParameters params(AudioParameters::AUDIO_FAKE, kChannelLayout,
                          kSampleRate, kBitsPerSample, kSamplesPerPacket);
 
   base::RunLoop unmute_run_loop;
   base::RunLoop mute_run_loop;
   base::RunLoop setup_run_loop;
-  EXPECT_CALL(event_handler, OnCreated(_)).Times(Exactly(1));
+  EXPECT_CALL(event_handler, OnCreated(_, false))
+      .WillOnce(InvokeWithoutArgs([&] { setup_run_loop.QuitWhenIdle(); }));
   EXPECT_CALL(event_handler, OnLog(_, _)).Times(Exactly(3));
   EXPECT_CALL(sync_writer, Close()).Times(Exactly(1));
   EXPECT_CALL(event_handler, OnMuted(_, true))
       .WillOnce(InvokeWithoutArgs([&] { mute_run_loop.Quit(); }));
   EXPECT_CALL(event_handler, OnMuted(_, false))
       .WillOnce(InvokeWithoutArgs([&] { unmute_run_loop.Quit(); }));
 
   FakeAudioInputStream::SetGlobalMutedState(false);
   controller = AudioInputController::Create(
       audio_manager_.get(), &event_handler, &sync_writer, nullptr, params,
       AudioDeviceDescription::kDefaultDeviceId, false);
   ASSERT_TRUE(controller.get());
-  setup_run_loop.RunUntilIdle();
+  RunLoopWithTimeout(&setup_run_loop, timeout);
 
   FakeAudioInputStream::SetGlobalMutedState(true);
   RunLoopWithTimeout(&mute_run_loop, timeout);
   FakeAudioInputStream::SetGlobalMutedState(false);
   RunLoopWithTimeout(&unmute_run_loop, timeout);
 
   CloseAudioController(controller.get());
 }
 
 TEST_F(AudioInputControllerTest, TestOnmutedCallbackInitiallyMuted) {
   const auto timeout = base::TimeDelta::FromMilliseconds(kOnMuteWaitTimeoutMs);
   MockAudioInputControllerEventHandler event_handler;
   MockSyncWriter sync_writer;
   scoped_refptr<AudioInputController> controller;
   WaitableEvent callback_event(WaitableEvent::ResetPolicy::AUTOMATIC,
                                WaitableEvent::InitialState::NOT_SIGNALED);
 
   AudioParameters params(AudioParameters::AUDIO_FAKE, kChannelLayout,
                          kSampleRate, kBitsPerSample, kSamplesPerPacket);
 
   base::RunLoop unmute_run_loop;
   base::RunLoop setup_run_loop;
-  EXPECT_CALL(event_handler, OnCreated(_)).Times(Exactly(1));
+  EXPECT_CALL(event_handler, OnCreated(_, true))
+      .WillOnce(InvokeWithoutArgs([&] { setup_run_loop.QuitWhenIdle(); }));
   EXPECT_CALL(event_handler, OnLog(_, _)).Times(Exactly(3));
   EXPECT_CALL(sync_writer, Close()).Times(Exactly(1));
-  EXPECT_CALL(event_handler, OnMuted(_, true))
-      .WillOnce(InvokeWithoutArgs([&] { setup_run_loop.QuitWhenIdle(); }));
   EXPECT_CALL(event_handler, OnMuted(_, false))
       .WillOnce(InvokeWithoutArgs([&] { unmute_run_loop.Quit(); }));
 
   FakeAudioInputStream::SetGlobalMutedState(true);
   controller = AudioInputController::Create(
       audio_manager_.get(), &event_handler, &sync_writer, nullptr, params,
       AudioDeviceDescription::kDefaultDeviceId, false);
   ASSERT_TRUE(controller.get());
   RunLoopWithTimeout(&setup_run_loop, timeout);
 
   FakeAudioInputStream::SetGlobalMutedState(false);
   RunLoopWithTimeout(&unmute_run_loop, timeout);
 
   CloseAudioController(controller.get());
 }
 
 }  // namespace media