media/audio/audio_input_controller_unittest.cc - Issue 1806313003: Pass task runners to AudioManager constructor.

Unified Diff: media/audio/audio_input_controller_unittest.cc

Issue 1806313003: Pass task runners to AudioManager constructor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 9 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

« media/audio/android/audio_manager_android.cc ('K') | « media/audio/android/audio_manager_android.cc ('k') | media/audio/audio_input_unittest.cc » ('j') | media/audio/mac/audio_manager_mac.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 6a35d87c9a3528afde811e810a3be263c25e472c..6a2517628aba039912506efbfe5d9bdcdbc21df8 100644

--- a/media/audio/audio_input_controller_unittest.cc

+++ b/media/audio/audio_input_controller_unittest.cc

@@ -67,11 +67,17 @@ class MockAudioInputControllerEventHandler

// Test fixture.

class AudioInputControllerTest : public testing::Test {

public:

- AudioInputControllerTest() {}

+ AudioInputControllerTest()

+ : audio_manager_(

+ AudioManager::CreateForTesting(message_loop_.task_runner())) {

+ // Flush the message loop to ensure that AudioManager is fully initialized.

+ message_loop_.RunUntilIdle();

+ }

~AudioInputControllerTest() override {}

protected:

base::MessageLoop message_loop_;

+ ScopedAudioManagerPtr audio_manager_;

private:

DISALLOW_COPY_AND_ASSIGN(AudioInputControllerTest);

@@ -85,16 +91,12 @@ TEST_F(AudioInputControllerTest, CreateAndClose) {

EXPECT_CALL(event_handler, OnCreated(NotNull()))

.WillOnce(QuitMessageLoop(&message_loop_));

- scoped_ptr<AudioManager> audio_manager(AudioManager::CreateForTesting());

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, NULL);

ASSERT_TRUE(controller.get());

// Wait for OnCreated() to fire.

@@ -123,17 +125,13 @@ TEST_F(AudioInputControllerTest, RecordAndClose) {

.WillRepeatedly(CheckCountAndPostQuitTask(

&count, 10, message_loop_.task_runner()));

- scoped_ptr<AudioManager> audio_manager(AudioManager::CreateForTesting());

AudioParameters params(AudioParameters::AUDIO_FAKE, kChannelLayout,

kSampleRate, kBitsPerSample, kSamplesPerPacket);

// 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, NULL);

ASSERT_TRUE(controller.get());

// Start recording and trigger one OnRecording() call.

@@ -176,17 +174,13 @@ TEST_F(AudioInputControllerTest, DISABLED_RecordAndError) {

.Times(Exactly(1))

.WillOnce(QuitMessageLoop(&message_loop_));

- scoped_ptr<AudioManager> audio_manager(AudioManager::CreateForTesting());

AudioParameters params(AudioParameters::AUDIO_FAKE, kChannelLayout,

kSampleRate, kBitsPerSample, kSamplesPerPacket);

// 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, NULL);

ASSERT_TRUE(controller.get());

// Start recording and trigger one OnRecording() call.

@@ -213,18 +207,14 @@ TEST_F(AudioInputControllerTest, SamplesPerPacketTooLarge) {

EXPECT_CALL(event_handler, OnCreated(NotNull()))

.Times(Exactly(0));

- scoped_ptr<AudioManager> audio_manager(AudioManager::CreateForTesting());

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, NULL);

ASSERT_FALSE(controller.get());

}

@@ -239,18 +229,14 @@ TEST_F(AudioInputControllerTest, CloseTwice) {

EXPECT_CALL(event_handler, OnRecording(NotNull()))

.Times(Exactly(1));

- scoped_ptr<AudioManager> audio_manager(AudioManager::CreateForTesting());

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, NULL);

ASSERT_TRUE(controller.get());

controller->Record();