media: Shutdown AudioManager in TestMojoMediaClient

media/mojo/services/test_mojo_media_client.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/mojo/services/test_mojo_media_client.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "media/audio/audio_device_description.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_output_stream_sink.h"
 #include "media/audio/audio_thread_impl.h"
 #include "media/base/cdm_factory.h"
 #include "media/base/media.h"
 #include "media/base/media_log.h"
 #include "media/base/null_video_sink.h"
 #include "media/base/renderer_factory.h"
 #include "media/cdm/default_cdm_factory.h"
 #include "media/renderers/default_renderer_factory.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
 
 namespace media {
 
 TestMojoMediaClient::TestMojoMediaClient() {}
 
 TestMojoMediaClient::~TestMojoMediaClient() {
   DVLOG(1) << __func__;
-  // AudioManager destructor requires MessageLoop.
-  // Destroy it before the message loop goes away.
-  audio_manager_.reset();
-  // Flush the message loop to ensure that the audio manager is destroyed.
-  base::RunLoop().RunUntilIdle();
+
+  if (audio_manager_) {
+    audio_manager_->Shutdown();
+    // AudioManager destructor requires MessageLoop.

[alokp, 2017/05/16 16:52:26]

You do not need to manually reset and flush the message loop. With the latest
changes, only Shutdown is necessary.

[xhwang, 2017/05/16 16:56:09]

Done.

+    // Destroy it before the message loop goes away.
+    audio_manager_.reset();
+    // Flush the message loop to ensure that the audio manager is destroyed.
+    base::RunLoop().RunUntilIdle();
+  }
 }
 
 void TestMojoMediaClient::Initialize(
     service_manager::Connector* /* connector */) {
   InitializeMediaLibrary();
   // TODO(dalecurtis): We should find a single owner per process for the audio
   // manager or make it a lazy instance.  It's not safe to call Get()/Create()
   // across multiple threads...
   AudioManager* audio_manager = AudioManager::Get();
   if (!audio_manager) {
     audio_manager_ = media::AudioManager::CreateForTesting(
         base::MakeUnique<AudioThreadImpl>());
-    audio_manager = audio_manager_.get();
     // Flush the message loop to ensure that the audio manager is initialized.
     base::RunLoop().RunUntilIdle();
   }
 }
 
 scoped_refptr<AudioRendererSink> TestMojoMediaClient::CreateAudioRendererSink(
     const std::string& /* audio_device_id */) {
   return new AudioOutputStreamSink();
 }
 
@@ skipping 10 matching lines @@
       media_log, nullptr, DefaultRendererFactory::GetGpuFactoriesCB());
 }
 
 std::unique_ptr<CdmFactory> TestMojoMediaClient::CreateCdmFactory(
     service_manager::mojom::InterfaceProvider* /* host_interfaces */) {
   DVLOG(1) << __func__;
   return base::MakeUnique<DefaultCdmFactory>();
 }
 
 }  // namespace media