Making AudioManagerBase::ShutdownOnAudioThread() platform-agnostic

media/audio/audio_manager.cc

Index: media/audio/audio_manager.cc
diff --git a/media/audio/audio_manager.cc b/media/audio/audio_manager.cc
index 87a2b121e5ca0f73d0e8199f59cc16e25b296013..51036092d34f0cb20fb287dc182b965c47928c4c 100644
--- a/media/audio/audio_manager.cc
+++ b/media/audio/audio_manager.cc
@@ -22,13 +22,8 @@
 #include "media/audio/fake_audio_log_factory.h"
 #include "media/base/media_switches.h"
 
-#if defined(OS_MACOSX)
-#include "media/audio/mac/audio_manager_mac.h"
-#endif
-
 #if defined(OS_WIN)
 #include "base/win/scoped_com_initializer.h"
-#include "media/audio/win/core_audio_util_win.h"
 #endif
 
 namespace media {
@@ -335,11 +330,11 @@ void AudioManager::Shutdown() {
   // TODO(alokp): Suspend hang monitor.
 
   if (audio_thread_->GetTaskRunner()->BelongsToCurrentThread()) {
-    ShutdownOnAudioThread();
+    ShutdownOnAudioThread(true);
   } else {
     audio_thread_->GetTaskRunner()->PostTask(
         FROM_HERE, base::Bind(&AudioManager::ShutdownOnAudioThread,
-                              base::Unretained(this)));
+                              base::Unretained(this), false));
   }
   audio_thread_->Stop();
   shutdown_ = true;