| Index: media/audio/linux/audio_manager_linux.cc
|
| diff --git a/media/audio/linux/audio_manager_linux.cc b/media/audio/linux/audio_manager_linux.cc
|
| index 5d9676e60f97bf3822c2219fe5235196decdf410..fa4a14063b5f27734cd8addf667345489227f20b 100644
|
| --- a/media/audio/linux/audio_manager_linux.cc
|
| +++ b/media/audio/linux/audio_manager_linux.cc
|
| @@ -30,7 +30,8 @@ enum LinuxAudioIO {
|
| ScopedAudioManagerPtr CreateAudioManager(
|
| scoped_refptr<base::SingleThreadTaskRunner> task_runner,
|
| scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
|
| - AudioLogFactory* audio_log_factory) {
|
| + AudioLogFactory* audio_log_factory,
|
| + CreateAudioFileWriterCallback create_audio_file_writer_callback) {
|
| #if defined(USE_CRAS)
|
| if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
|
| UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
|
| @@ -45,8 +46,8 @@ ScopedAudioManagerPtr CreateAudioManager(
|
| // If the creation fails, we need to use the task runners to create other
|
| // AudioManager implementations.
|
| std::unique_ptr<AudioManagerPulse, AudioManagerDeleter> manager(
|
| - new AudioManagerPulse(task_runner, worker_task_runner,
|
| - audio_log_factory));
|
| + new AudioManagerPulse(task_runner, worker_task_runner, audio_log_factory,
|
| + create_audio_file_writer_callback));
|
| if (manager->Init()) {
|
| UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kPulse, kAudioIOMax + 1);
|
| return std::move(manager);
|
| @@ -56,13 +57,13 @@ ScopedAudioManagerPtr CreateAudioManager(
|
|
|
| #if defined(USE_ALSA)
|
| UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kAlsa, kAudioIOMax + 1);
|
| - return ScopedAudioManagerPtr(
|
| - new AudioManagerAlsa(std::move(task_runner),
|
| - std::move(worker_task_runner), audio_log_factory));
|
| + return ScopedAudioManagerPtr(new AudioManagerAlsa(
|
| + std::move(task_runner), std::move(worker_task_runner), audio_log_factory,
|
| + std::move(create_audio_file_writer_callback)));
|
| #else
|
| - return ScopedAudioManagerPtr(
|
| - new FakeAudioManager(std::move(task_runner),
|
| - std::move(worker_task_runner), audio_log_factory));
|
| + return ScopedAudioManagerPtr(new FakeAudioManager(
|
| + std::move(task_runner), std::move(worker_task_runner), audio_log_factory,
|
| + std::move(create_audio_file_writer_callback)));
|
| #endif
|
| }
|
|
|
|
|