| Index: media/audio/audio_input_controller_unittest.cc
|
| diff --git a/media/audio/audio_input_controller_unittest.cc b/media/audio/audio_input_controller_unittest.cc
|
| index b96ef3ad01686f3c1e0425d9051653d39f9883b2..c090787fe7b8dec7eddf74b7258b8c3b5930287e 100644
|
| --- a/media/audio/audio_input_controller_unittest.cc
|
| +++ b/media/audio/audio_input_controller_unittest.cc
|
| @@ -83,9 +83,14 @@ TEST_F(AudioInputControllerTest, CreateAndClose) {
|
| scoped_ptr<AudioManager> audio_manager(AudioManager::Create());
|
| AudioParameters params(AudioParameters::AUDIO_FAKE, kChannelLayout,
|
| kSampleRate, kBitsPerSample, kSamplesPerPacket);
|
| + scoped_ptr<KeyPressMonitor> key_press_monitor(new KeyPressMonitor(
|
| + audio_manager->GetMessageLoop()));
|
| scoped_refptr<AudioInputController> controller =
|
| - AudioInputController::Create(audio_manager.get(), &event_handler, params,
|
| - AudioManagerBase::kDefaultDeviceId);
|
| + AudioInputController::Create(audio_manager.get(),
|
| + &event_handler,
|
| + params,
|
| + AudioManagerBase::kDefaultDeviceId,
|
| + key_press_monitor.get());
|
| ASSERT_TRUE(controller.get());
|
|
|
| // Wait for OnCreated() to fire.
|
| @@ -119,9 +124,14 @@ TEST_F(AudioInputControllerTest, RecordAndClose) {
|
| kSampleRate, kBitsPerSample, kSamplesPerPacket);
|
|
|
| // Creating the AudioInputController should render an OnCreated() call.
|
| + scoped_ptr<KeyPressMonitor> key_press_monitor(new KeyPressMonitor(
|
| + audio_manager->GetMessageLoop()));
|
| scoped_refptr<AudioInputController> controller =
|
| - AudioInputController::Create(audio_manager.get(), &event_handler, params,
|
| - AudioManagerBase::kDefaultDeviceId);
|
| + AudioInputController::Create(audio_manager.get(),
|
| + &event_handler,
|
| + params,
|
| + AudioManagerBase::kDefaultDeviceId,
|
| + key_press_monitor.get());
|
| ASSERT_TRUE(controller.get());
|
|
|
| // Start recording and trigger one OnRecording() call.
|
| @@ -166,9 +176,14 @@ TEST_F(AudioInputControllerTest, RecordAndError) {
|
| kSampleRate, kBitsPerSample, kSamplesPerPacket);
|
|
|
| // Creating the AudioInputController should render an OnCreated() call.
|
| + scoped_ptr<KeyPressMonitor> key_press_monitor(new KeyPressMonitor(
|
| + audio_manager->GetMessageLoop()));
|
| scoped_refptr<AudioInputController> controller =
|
| - AudioInputController::Create(audio_manager.get(), &event_handler, params,
|
| - AudioManagerBase::kDefaultDeviceId);
|
| + AudioInputController::Create(audio_manager.get(),
|
| + &event_handler,
|
| + params,
|
| + AudioManagerBase::kDefaultDeviceId,
|
| + key_press_monitor.get());
|
| ASSERT_TRUE(controller.get());
|
|
|
| // Start recording and trigger one OnRecording() call.
|
| @@ -198,9 +213,14 @@ TEST_F(AudioInputControllerTest, SamplesPerPacketTooLarge) {
|
| scoped_ptr<AudioManager> audio_manager(AudioManager::Create());
|
| AudioParameters params(AudioParameters::AUDIO_FAKE, kChannelLayout,
|
| kSampleRate, kBitsPerSample, kSamplesPerPacket * 1000);
|
| + scoped_ptr<KeyPressMonitor> key_press_monitor(new KeyPressMonitor(
|
| + audio_manager->GetMessageLoop()));
|
| scoped_refptr<AudioInputController> controller =
|
| - AudioInputController::Create(audio_manager.get(), &event_handler, params,
|
| - AudioManagerBase::kDefaultDeviceId);
|
| + AudioInputController::Create(audio_manager.get(),
|
| + &event_handler,
|
| + params,
|
| + AudioManagerBase::kDefaultDeviceId,
|
| + key_press_monitor.get());
|
| ASSERT_FALSE(controller.get());
|
| }
|
|
|
| @@ -218,9 +238,14 @@ TEST_F(AudioInputControllerTest, CloseTwice) {
|
| scoped_ptr<AudioManager> audio_manager(AudioManager::Create());
|
| AudioParameters params(AudioParameters::AUDIO_FAKE, kChannelLayout,
|
| kSampleRate, kBitsPerSample, kSamplesPerPacket);
|
| + scoped_ptr<KeyPressMonitor> key_press_monitor(new KeyPressMonitor(
|
| + audio_manager->GetMessageLoop()));
|
| scoped_refptr<AudioInputController> controller =
|
| - AudioInputController::Create(audio_manager.get(), &event_handler, params,
|
| - AudioManagerBase::kDefaultDeviceId);
|
| + AudioInputController::Create(audio_manager.get(),
|
| + &event_handler,
|
| + params,
|
| + AudioManagerBase::kDefaultDeviceId,
|
| + key_press_monitor.get());
|
| ASSERT_TRUE(controller.get());
|
|
|
| controller->Record();
|
|
|