| Index: media/audio/audio_manager_unittest.cc
|
| diff --git a/media/audio/audio_manager_unittest.cc b/media/audio/audio_manager_unittest.cc
|
| index 75925150e36ca1481162ad7e750e5c3471a574de..fa4cb02609aeec8e576df42f5a027fb11ba968a1 100644
|
| --- a/media/audio/audio_manager_unittest.cc
|
| +++ b/media/audio/audio_manager_unittest.cc
|
| @@ -20,6 +20,7 @@
|
| #include "media/audio/audio_device_name.h"
|
| #include "media/audio/audio_output_proxy.h"
|
| #include "media/audio/audio_unittest_util.h"
|
| +#include "media/audio/fake_audio_file_writer.h"
|
| #include "media/audio/fake_audio_log_factory.h"
|
| #include "media/audio/fake_audio_manager.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -49,12 +50,14 @@
|
| namespace media {
|
|
|
| namespace {
|
| +
|
| template <typename T>
|
| struct TestAudioManagerFactory {
|
| static ScopedAudioManagerPtr Create(AudioLogFactory* audio_log_factory) {
|
| - return ScopedAudioManagerPtr(new T(base::ThreadTaskRunnerHandle::Get(),
|
| - base::ThreadTaskRunnerHandle::Get(),
|
| - audio_log_factory));
|
| + return ScopedAudioManagerPtr(
|
| + new T(base::ThreadTaskRunnerHandle::Get(),
|
| + base::ThreadTaskRunnerHandle::Get(), audio_log_factory,
|
| + base::Bind(&FakeAudioFileWriter::Create)));
|
| }
|
| };
|
|
|
| @@ -65,7 +68,8 @@ struct TestAudioManagerFactory<AudioManagerPulse> {
|
| std::unique_ptr<AudioManagerPulse, AudioManagerDeleter> manager(
|
| new AudioManagerPulse(base::ThreadTaskRunnerHandle::Get(),
|
| base::ThreadTaskRunnerHandle::Get(),
|
| - audio_log_factory));
|
| + audio_log_factory,
|
| + base::Bind(&FakeAudioFileWriter::Create)));
|
| if (!manager->Init())
|
| manager.reset();
|
| return std::move(manager);
|
| @@ -668,8 +672,12 @@ class TestAudioManager : public FakeAudioManager {
|
| TestAudioManager(
|
| scoped_refptr<base::SingleThreadTaskRunner> task_runner,
|
| scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
|
| - AudioLogFactory* audio_log_factory)
|
| - : FakeAudioManager(task_runner, worker_task_runner, audio_log_factory) {}
|
| + AudioLogFactory* audio_log_factory,
|
| + CreateAudioFileWriterCallback create_audio_file_writer_callback)
|
| + : FakeAudioManager(task_runner,
|
| + worker_task_runner,
|
| + audio_log_factory,
|
| + create_audio_file_writer_callback) {}
|
|
|
| std::string GetDefaultOutputDeviceID() override { return "output4"; }
|
|
|
|
|