Pass task runners to AudioManager constructor.

media/audio/linux/audio_manager_linux.cc

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 0e7c9810a5c29e3b9a4e6e9c60e89163e60f850a..8a9a30800f93c2ef52280e263277f9b12c8333ef 100644
--- a/media/audio/linux/audio_manager_linux.cc
+++ b/media/audio/linux/audio_manager_linux.cc
@@ -4,6 +4,9 @@
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
+#include "media/audio/audio_thread.h"
+#include "media/base/media_switches.h"
+
 #if defined(USE_ALSA)
 #include "media/audio/alsa/audio_manager_alsa.h"
 #else
@@ -15,7 +18,6 @@
 #if defined(USE_PULSEAUDIO)
 #include "media/audio/pulse/audio_manager_pulse.h"
 #endif
-#include "media/base/media_switches.h"
 
 namespace media {
 
@@ -26,27 +28,40 @@ enum LinuxAudioIO {
   kAudioIOMax = kCras  // Must always be equal to largest logged entry.
 };
 
-AudioManager* CreateAudioManager(AudioLogFactory* audio_log_factory) {
+AudioManager* CreateAudioManager(

[DaleCurtis, 2016/03/18 17:48:19]

It'd be nice if the default Create() function handled sorting this out instead
of copy/pasting the same logic for all classes.

[alokp, 2016/03/18 18:40:07]

I did not not do that because I wanted to use a different default task runner
for Cast. But we can avoid that by adding
ContentBrowserClient::GetAudioTaskRunner.

+    const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
+    const scoped_refptr<base::SingleThreadTaskRunner>& worker_task_runner,
+    AudioLogFactory* audio_log_factory) {
+  scoped_refptr<base::SingleThreadTaskRunner> audio_runner =
+      task_runner ? task_runner : AudioThread::Get()->task_runner();
+  scoped_refptr<base::SingleThreadTaskRunner> worker_runner =
+      worker_task_runner ? worker_task_runner
+                         : AudioThread::Get()->task_runner();
+
 #if defined(USE_CRAS)
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
     UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
-    return new AudioManagerCras(audio_log_factory);
+    return new AudioManagerCras(audio_runner, worker_runner, audio_log_factory);
   }
 #endif
 
 #if defined(USE_PULSEAUDIO)
-  AudioManager* manager = AudioManagerPulse::Create(audio_log_factory);
-  if (manager) {
+  scoped_ptr<AudioManagerPulse> manager(
+      new AudioManagerPulse(audio_runner, worker_runner, audio_log_factory));
+  if (manager->Init()) {
     UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kPulse, kAudioIOMax + 1);
-    return manager;
+    return manager.release();
+  } else {
+    DVLOG(1) << "PulseAudio is not available on the OS";
+    AudioManager::Destroy(manager.release());
   }
 #endif
 
 #if defined(USE_ALSA)
   UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kAlsa, kAudioIOMax + 1);
-  return new AudioManagerAlsa(audio_log_factory);
+  return new AudioManagerAlsa(audio_runner, worker_runner, audio_log_factory);
 #else
-  return new FakeAudioManager(audio_log_factory);
+  return new FakeAudioManager(audio_runner, worker_runner, audio_log_factory);
 #endif
 }