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: Pass task runners into AudioManager::Create 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

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..ada97bb66b2f30c064625f66d59e7dc311b30e40 100644

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

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

@@ -9,6 +9,7 @@

#include "base/test/test_timeouts.h"

#include "media/audio/audio_input_controller.h"

#include "media/audio/audio_manager_base.h"

+#include "media/audio/fake_audio_log_factory.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -67,11 +68,19 @@ class MockAudioInputControllerEventHandler

// Test fixture.

class AudioInputControllerTest : public testing::Test {

public:

- AudioInputControllerTest() {}

- ~AudioInputControllerTest() override {}

+ AudioInputControllerTest()

+ : audio_manager_(AudioManager::Create(nullptr,

DaleCurtis 2016/03/18 17:48:18 I think it might be worth keeping the CreateForTes

alokp 2016/03/18 18:40:06 OK. Should it take only one task_runner?

+ nullptr,

+ &fake_audio_log_factory_)) {}

+ ~AudioInputControllerTest() override {

+ AudioManager::Destroy(audio_manager_.release());

+ }

protected:

base::MessageLoop message_loop_;

+ FakeAudioLogFactory fake_audio_log_factory_;

+ scoped_ptr<AudioManager> audio_manager_;

private:

DISALLOW_COPY_AND_ASSIGN(AudioInputControllerTest);

@@ -85,16 +94,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 +128,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 +177,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 +210,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 +232,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();

« content/browser/browser_main_loop.cc ('K') | « media/audio/alsa/audio_manager_alsa.cc ('k') | media/audio/audio_input_unittest.cc » ('j') | media/audio/audio_manager.h » ('J')