| Index: media/audio/audio_output_controller_unittest.cc
|
| diff --git a/media/audio/audio_output_controller_unittest.cc b/media/audio/audio_output_controller_unittest.cc
|
| index 1046893ae589fb4a3ffa1efbf30497c02f3fcfb3..f9d633f504151510a0605bb3c49d359cf872e563 100644
|
| --- a/media/audio/audio_output_controller_unittest.cc
|
| +++ b/media/audio/audio_output_controller_unittest.cc
|
| @@ -15,6 +15,7 @@
|
| #include "media/audio/audio_manager_base.h"
|
| #include "media/audio/audio_output_controller.h"
|
| #include "media/audio/audio_parameters.h"
|
| +#include "media/audio/fake_audio_log_factory.h"
|
| #include "media/base/audio_bus.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -94,12 +95,14 @@ ACTION(PopulateBuffer) {
|
| class AudioOutputControllerTest : public testing::Test {
|
| public:
|
| AudioOutputControllerTest()
|
| - : audio_manager_(AudioManager::CreateForTesting()),
|
| + : audio_manager_(AudioManager::Create(nullptr,
|
| + nullptr,
|
| + nullptr,
|
| + &fake_audio_log_factory_)),
|
| create_event_(false, false),
|
| play_event_(false, false),
|
| read_event_(false, false),
|
| - pause_event_(false, false) {
|
| - }
|
| + pause_event_(false, false) {}
|
|
|
| ~AudioOutputControllerTest() override {}
|
|
|
| @@ -253,7 +256,8 @@ class AudioOutputControllerTest : public testing::Test {
|
|
|
| private:
|
| base::MessageLoopForIO message_loop_;
|
| - scoped_ptr<AudioManager> audio_manager_;
|
| + FakeAudioLogFactory fake_audio_log_factory_;
|
| + ScopedAudioManagerPtr audio_manager_;
|
| MockAudioOutputControllerEventHandler mock_event_handler_;
|
| MockAudioOutputControllerSyncReader mock_sync_reader_;
|
| MockAudioOutputStream mock_stream_;
|
|
|