media/audio/audio_input_controller_unittest.cc - Issue 8818012: Remove the AudioManager singleton.

Unified Diff: media/audio/audio_input_controller_unittest.cc

Issue 8818012: Remove the AudioManager singleton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Set svn eol properties for a couple of files Created 9 years 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

Index: media/audio/audio_input_controller_unittest.cc

===================================================================

--- media/audio/audio_input_controller_unittest.cc (revision 114012)

+++ media/audio/audio_input_controller_unittest.cc (working copy)

@@ -51,10 +51,11 @@

EXPECT_CALL(event_handler, OnCreated(NotNull()))

.WillOnce(InvokeWithoutArgs(&event, &base::WaitableEvent::Signal));

+ scoped_refptr<AudioManager> audio_manager(AudioManager::Create());

AudioParameters params(AudioParameters::AUDIO_MOCK, kChannelLayout,

kSampleRate, kBitsPerSample, kSamplesPerPacket);

scoped_refptr<AudioInputController> controller =

- AudioInputController::Create(&event_handler, params);

+ AudioInputController::Create(audio_manager, &event_handler, params);

ASSERT_TRUE(controller.get());

// Wait for OnCreated() to be called.

@@ -82,10 +83,11 @@

.Times(AtLeast(10))

.WillRepeatedly(CheckCountAndSignalEvent(&count, 10, &event));

+ scoped_refptr<AudioManager> audio_manager(AudioManager::Create());

AudioParameters params(AudioParameters::AUDIO_MOCK, kChannelLayout,

kSampleRate, kBitsPerSample, kSamplesPerPacket);

scoped_refptr<AudioInputController> controller =

- AudioInputController::Create(&event_handler, params);

+ AudioInputController::Create(audio_manager, &event_handler, params);

ASSERT_TRUE(controller.get());

// Wait for OnCreated() to be called.

@@ -123,10 +125,11 @@

EXPECT_CALL(event_handler, OnError(NotNull(), 0))

.WillOnce(InvokeWithoutArgs(&event, &base::WaitableEvent::Signal));

+ scoped_refptr<AudioManager> audio_manager(AudioManager::Create());

AudioParameters params(AudioParameters::AUDIO_MOCK, kChannelLayout,

kSampleRate, kBitsPerSample, kSamplesPerPacket);

scoped_refptr<AudioInputController> controller =

- AudioInputController::Create(&event_handler, params);

+ AudioInputController::Create(audio_manager, &event_handler, params);

ASSERT_TRUE(controller.get());

// Wait for OnCreated() to be called.

@@ -151,10 +154,11 @@

// Create an audio device with a very large packet size.

MockAudioInputControllerEventHandler event_handler;

+ scoped_refptr<AudioManager> audio_manager(AudioManager::Create());

AudioParameters params(AudioParameters::AUDIO_MOCK, kChannelLayout,

kSampleRate, kBitsPerSample, kSamplesPerPacket * 1000);

scoped_refptr<AudioInputController> controller = AudioInputController::Create(

- &event_handler, params);

+ audio_manager, &event_handler, params);

ASSERT_FALSE(controller);

}

@@ -162,10 +166,11 @@

TEST(AudioInputControllerTest, CloseTwice) {

MockAudioInputControllerEventHandler event_handler;

EXPECT_CALL(event_handler, OnCreated(NotNull()));

+ scoped_refptr<AudioManager> audio_manager(AudioManager::Create());

AudioParameters params(AudioParameters::AUDIO_MOCK, kChannelLayout,

kSampleRate, kBitsPerSample, kSamplesPerPacket);

scoped_refptr<AudioInputController> controller =

- AudioInputController::Create(&event_handler, params);

+ AudioInputController::Create(audio_manager, &event_handler, params);

ASSERT_TRUE(controller.get());

controller->Close();

« no previous file with comments | « media/audio/audio_input_controller.cc ('k') | media/audio/audio_input_device_unittest.cc » ('j') | no next file with comments »