Ensures that audio tasks cannot run after AudioManager is deleted.

content/browser/renderer_host/media/audio_output_authorization_handler_unittest.cc

Index: content/browser/renderer_host/media/audio_output_authorization_handler_unittest.cc
diff --git a/content/browser/renderer_host/media/audio_output_authorization_handler_unittest.cc b/content/browser/renderer_host/media/audio_output_authorization_handler_unittest.cc
index ba65fcd0df1e6a0a212106498c81435d3359714f..e5968da34e514df19b046af2f3cb0407349e28a6 100644
--- a/content/browser/renderer_host/media/audio_output_authorization_handler_unittest.cc
+++ b/content/browser/renderer_host/media/audio_output_authorization_handler_unittest.cc
@@ -11,7 +11,6 @@
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/test/mock_callback.h"
-#include "content/browser/audio_manager_thread.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/mock_render_process_host.h"
@@ -19,6 +18,7 @@
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "media/audio/audio_device_description.h"
 #include "media/audio/audio_system_impl.h"
+#include "media/audio/audio_thread_impl.h"
 #include "media/audio/fake_audio_log_factory.h"
 #include "media/audio/fake_audio_manager.h"
 #include "media/base/media_switches.h"
@@ -63,10 +63,8 @@ class AudioOutputAuthorizationHandlerTest : public testing::Test {
 
     thread_bundle_ = base::MakeUnique<TestBrowserThreadBundle>(
         TestBrowserThreadBundle::Options::REAL_IO_THREAD);
-    audio_thread_ = base::MakeUnique<AudioManagerThread>();
     audio_manager_.reset(new media::FakeAudioManager(
-        audio_thread_->task_runner(), audio_thread_->worker_task_runner(),
-        &log_factory_));
+        base::MakeUnique<media::AudioThreadImpl>(), &log_factory_));
     audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get());
     media_stream_manager_ =
         base::MakeUnique<MediaStreamManager>(audio_system_.get());
@@ -74,7 +72,10 @@ class AudioOutputAuthorizationHandlerTest : public testing::Test {
     SyncWithAllThreads();
   }
 
-  ~AudioOutputAuthorizationHandlerTest() override { SyncWithAllThreads(); }
+  ~AudioOutputAuthorizationHandlerTest() override {
+    SyncWithAllThreads();
+    audio_manager_->Shutdown();
+  }
 
  protected:
   MediaStreamManager* GetMediaStreamManager() {
@@ -139,9 +140,8 @@ class AudioOutputAuthorizationHandlerTest : public testing::Test {
   // DestructionObserver.
   std::unique_ptr<MediaStreamManager> media_stream_manager_;
   std::unique_ptr<TestBrowserThreadBundle> thread_bundle_;
-  std::unique_ptr<AudioManagerThread> audio_thread_;
   media::FakeAudioLogFactory log_factory_;
-  media::ScopedAudioManagerPtr audio_manager_;
+  std::unique_ptr<media::AudioManager> audio_manager_;
   std::unique_ptr<media::AudioSystem> audio_system_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioOutputAuthorizationHandlerTest);