| Index: media/audio/audio_input_unittest.cc
|
| diff --git a/media/audio/audio_input_unittest.cc b/media/audio/audio_input_unittest.cc
|
| index abb47ce955be1299d5fcd201869e11981120bcfa..430cced00ea0e4f413d449877593c6c9b82d15ec 100644
|
| --- a/media/audio/audio_input_unittest.cc
|
| +++ b/media/audio/audio_input_unittest.cc
|
| @@ -16,6 +16,7 @@
|
| #include "media/audio/audio_io.h"
|
| #include "media/audio/audio_manager_base.h"
|
| #include "media/audio/audio_unittest_util.h"
|
| +#include "media/audio/fake_audio_log_factory.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace media {
|
| @@ -51,16 +52,23 @@ class TestInputCallback : public AudioInputStream::AudioInputCallback {
|
|
|
| class AudioInputTest : public testing::Test {
|
| public:
|
| - AudioInputTest() :
|
| - message_loop_(base::MessageLoop::TYPE_UI),
|
| - audio_manager_(AudioManager::CreateForTesting()),
|
| - audio_input_stream_(NULL) {
|
| - // Wait for the AudioManager to finish any initialization on the audio loop.
|
| - base::RunLoop().RunUntilIdle();
|
| + AudioInputTest()
|
| + : message_loop_(base::MessageLoop::TYPE_UI),
|
| + audio_manager_(AudioManager::Create(nullptr,
|
| + nullptr,
|
| + nullptr,
|
| + &fake_audio_log_factory_)),
|
| + audio_input_stream_(NULL) {
|
| + // Wait for the AudioManager to finish any initialization on the audio
|
| + // loop.
|
| + base::RunLoop().RunUntilIdle();
|
| + }
|
| +
|
| + ~AudioInputTest() override {
|
| + AudioManager::Destroy(audio_manager_.release());
|
| + base::RunLoop().RunUntilIdle();
|
| }
|
|
|
| - ~AudioInputTest() override { base::RunLoop().RunUntilIdle(); }
|
| -
|
| protected:
|
| bool InputDevicesAvailable() {
|
| return audio_manager_->HasAudioInputDevices();
|
| @@ -166,6 +174,7 @@ class AudioInputTest : public testing::Test {
|
| }
|
|
|
| base::MessageLoop message_loop_;
|
| + FakeAudioLogFactory fake_audio_log_factory_;
|
| scoped_ptr<AudioManager> audio_manager_;
|
| AudioInputStream* audio_input_stream_;
|
|
|
|
|