Pass task runners to AudioManager constructor.

media/audio/win/audio_manager_win.cc

Index: media/audio/win/audio_manager_win.cc
diff --git a/media/audio/win/audio_manager_win.cc b/media/audio/win/audio_manager_win.cc
index ba8f665886a2146d03168d81c738a665b9966c83..56bd936d52e0deb9bf478fd651e0af83786c49b1 100644
--- a/media/audio/win/audio_manager_win.cc
+++ b/media/audio/win/audio_manager_win.cc
@@ -129,14 +129,19 @@ static int NumberOfWaveOutBuffers() {
   return (base::win::GetVersion() == base::win::VERSION_VISTA) ? 4 : 3;
 }
 
-AudioManagerWin::AudioManagerWin(AudioLogFactory* audio_log_factory)
-    : AudioManagerBase(audio_log_factory),
+AudioManagerWin::AudioManagerWin(
+    scoped_refptr<base::SingleThreadTaskRunner> task_runner,
+    scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
+    AudioLogFactory* audio_log_factory)
+    : AudioManagerBase(std::move(task_runner),
+                       std::move(worker_task_runner),
+                       audio_log_factory),
       // |CoreAudioUtil::IsSupported()| uses static variables to avoid doing
       // multiple initializations.  This is however not thread safe.
       // So, here we call it explicitly before we kick off the audio thread
       // or do any other work.
-      enumeration_type_(CoreAudioUtil::IsSupported() ?
-          kMMDeviceEnumeration : kWaveEnumeration) {
+      enumeration_type_(CoreAudioUtil::IsSupported() ? kMMDeviceEnumeration
+                                                     : kWaveEnumeration) {
   SetMaxOutputStreamsAllowed(kMaxOutputStreams);
 
   // WARNING: This is executed on the UI loop, do not add any code here which
@@ -150,11 +155,10 @@ AudioManagerWin::AudioManagerWin(AudioLogFactory* audio_log_factory)
 }
 
 AudioManagerWin::~AudioManagerWin() {
-  // It's safe to post a task here since Shutdown() will wait for all tasks to
-  // complete before returning.
-  GetTaskRunner()->PostTask(FROM_HERE, base::Bind(
-      &AudioManagerWin::ShutdownOnAudioThread, base::Unretained(this)));
+  DCHECK(GetTaskRunner()->BelongsToCurrentThread());
+
   Shutdown();
+  ShutdownOnAudioThread();
 }
 
 bool AudioManagerWin::HasAudioOutputDevices() {
@@ -540,8 +544,13 @@ AudioInputStream* AudioManagerWin::CreatePCMWaveInAudioInputStream(
 }
 
 /// static
-AudioManager* CreateAudioManager(AudioLogFactory* audio_log_factory) {
-  return new AudioManagerWin(audio_log_factory);
+ScopedAudioManagerPtr CreateAudioManager(
+    scoped_refptr<base::SingleThreadTaskRunner> task_runner,
+    scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
+    AudioLogFactory* audio_log_factory) {
+  return ScopedAudioManagerPtr(
+      new AudioManagerWin(std::move(task_runner), std::move(worker_task_runner),
+                          audio_log_factory));
 }
 
 }  // namespace media