Revert of 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 5d9676e60f97bf3822c2219fe5235196decdf410..0e7c9810a5c29e3b9a4e6e9c60e89163e60f850a 100644
--- a/media/audio/linux/audio_manager_linux.cc
+++ b/media/audio/linux/audio_manager_linux.cc
@@ -4,8 +4,6 @@
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
-#include "media/base/media_switches.h"
-
 #if defined(USE_ALSA)
 #include "media/audio/alsa/audio_manager_alsa.h"
 #else
@@ -17,6 +15,7 @@
 #if defined(USE_PULSEAUDIO)
 #include "media/audio/pulse/audio_manager_pulse.h"
 #endif
+#include "media/base/media_switches.h"
 
 namespace media {
 
@@ -27,42 +26,27 @@
   kAudioIOMax = kCras  // Must always be equal to largest logged entry.
 };
 
-ScopedAudioManagerPtr CreateAudioManager(
-    scoped_refptr<base::SingleThreadTaskRunner> task_runner,
-    scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
-    AudioLogFactory* audio_log_factory) {
+AudioManager* CreateAudioManager(AudioLogFactory* audio_log_factory) {
 #if defined(USE_CRAS)
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
     UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
-    return ScopedAudioManagerPtr(
-        new AudioManagerCras(std::move(task_runner),
-                             std::move(worker_task_runner), audio_log_factory));
+    return new AudioManagerCras(audio_log_factory);
   }
 #endif
 
 #if defined(USE_PULSEAUDIO)
-  // Do not move task runners when creating AudioManagerPulse.
-  // 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));
-  if (manager->Init()) {
+  AudioManager* manager = AudioManagerPulse::Create(audio_log_factory);
+  if (manager) {
     UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kPulse, kAudioIOMax + 1);
-    return std::move(manager);
+    return manager;
   }
-  DVLOG(1) << "PulseAudio is not available on the OS";
 #endif
 
 #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 new AudioManagerAlsa(audio_log_factory);
 #else
-  return ScopedAudioManagerPtr(
-      new FakeAudioManager(std::move(task_runner),
-                           std::move(worker_task_runner), audio_log_factory));
+  return new FakeAudioManager(audio_log_factory);
 #endif
 }