Index: trunk/src/media/audio/audio_input_controller_unittest.cc |
=================================================================== |
--- trunk/src/media/audio/audio_input_controller_unittest.cc (revision 217773) |
+++ trunk/src/media/audio/audio_input_controller_unittest.cc (working copy) |
@@ -83,13 +83,9 @@ |
scoped_ptr<AudioManager> audio_manager(AudioManager::Create()); |
AudioParameters params(AudioParameters::AUDIO_FAKE, kChannelLayout, |
kSampleRate, kBitsPerSample, kSamplesPerPacket); |
- |
scoped_refptr<AudioInputController> controller = |
- AudioInputController::Create(audio_manager.get(), |
- &event_handler, |
- params, |
- AudioManagerBase::kDefaultDeviceId, |
- NULL); |
+ AudioInputController::Create(audio_manager.get(), &event_handler, params, |
+ AudioManagerBase::kDefaultDeviceId); |
ASSERT_TRUE(controller.get()); |
// Wait for OnCreated() to fire. |
@@ -124,11 +120,8 @@ |
// Creating the AudioInputController should render an OnCreated() call. |
scoped_refptr<AudioInputController> controller = |
- AudioInputController::Create(audio_manager.get(), |
- &event_handler, |
- params, |
- AudioManagerBase::kDefaultDeviceId, |
- NULL); |
+ AudioInputController::Create(audio_manager.get(), &event_handler, params, |
+ AudioManagerBase::kDefaultDeviceId); |
ASSERT_TRUE(controller.get()); |
// Start recording and trigger one OnRecording() call. |
@@ -174,11 +167,8 @@ |
// Creating the AudioInputController should render an OnCreated() call. |
scoped_refptr<AudioInputController> controller = |
- AudioInputController::Create(audio_manager.get(), |
- &event_handler, |
- params, |
- AudioManagerBase::kDefaultDeviceId, |
- NULL); |
+ AudioInputController::Create(audio_manager.get(), &event_handler, params, |
+ AudioManagerBase::kDefaultDeviceId); |
ASSERT_TRUE(controller.get()); |
// Start recording and trigger one OnRecording() call. |
@@ -206,17 +196,11 @@ |
.Times(Exactly(0)); |
scoped_ptr<AudioManager> audio_manager(AudioManager::Create()); |
- AudioParameters params(AudioParameters::AUDIO_FAKE, |
- kChannelLayout, |
- kSampleRate, |
- kBitsPerSample, |
- kSamplesPerPacket * 1000); |
+ AudioParameters params(AudioParameters::AUDIO_FAKE, kChannelLayout, |
+ kSampleRate, kBitsPerSample, kSamplesPerPacket * 1000); |
scoped_refptr<AudioInputController> controller = |
- AudioInputController::Create(audio_manager.get(), |
- &event_handler, |
- params, |
- AudioManagerBase::kDefaultDeviceId, |
- NULL); |
+ AudioInputController::Create(audio_manager.get(), &event_handler, params, |
+ AudioManagerBase::kDefaultDeviceId); |
ASSERT_FALSE(controller.get()); |
} |
@@ -232,17 +216,11 @@ |
.Times(Exactly(1)); |
scoped_ptr<AudioManager> audio_manager(AudioManager::Create()); |
- AudioParameters params(AudioParameters::AUDIO_FAKE, |
- kChannelLayout, |
- kSampleRate, |
- kBitsPerSample, |
- kSamplesPerPacket); |
+ AudioParameters params(AudioParameters::AUDIO_FAKE, kChannelLayout, |
+ kSampleRate, kBitsPerSample, kSamplesPerPacket); |
scoped_refptr<AudioInputController> controller = |
- AudioInputController::Create(audio_manager.get(), |
- &event_handler, |
- params, |
- AudioManagerBase::kDefaultDeviceId, |
- NULL); |
+ AudioInputController::Create(audio_manager.get(), &event_handler, params, |
+ AudioManagerBase::kDefaultDeviceId); |
ASSERT_TRUE(controller.get()); |
controller->Record(); |