Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1630)

Unified Diff: media/audio/audio_input_controller_unittest.cc

Issue 21183002: Adding key press detection in the browser process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..36733ab08060a46fadf56b4c6e82925eb41c81e8 100644
--- a/media/audio/audio_input_controller_unittest.cc
+++ b/media/audio/audio_input_controller_unittest.cc
@@ -83,9 +83,13 @@ 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());
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 +123,13 @@ TEST_F(AudioInputControllerTest, RecordAndClose) {
kSampleRate, kBitsPerSample, kSamplesPerPacket);
// Creating the AudioInputController should render an OnCreated() call.
+ scoped_ptr<KeyPressMonitor> key_press_monitor(new KeyPressMonitor());
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 +174,13 @@ TEST_F(AudioInputControllerTest, RecordAndError) {
kSampleRate, kBitsPerSample, kSamplesPerPacket);
// Creating the AudioInputController should render an OnCreated() call.
+ scoped_ptr<KeyPressMonitor> key_press_monitor(new KeyPressMonitor());
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 +210,13 @@ 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());
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 +234,13 @@ 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());
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();

Powered by Google App Engine
This is Rietveld 408576698