From f63c2eb74e98a0c0c8384ca885e30dc7cff70c50 Mon Sep 17 00:00:00 2001 From: "dalecurtis@chromium.org" Date: Tue, 10 Dec 2013 04:44:47 +0000 Subject: [PATCH] Destroy existing AudioManager instances before creating new ones. BUG=327013 TEST=no more crashes Review URL: https://codereview.chromium.org/93793008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239651 0039d316-1c4b-4281-b951-d872f2087c98 --- media/audio/audio_manager_unittest.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/media/audio/audio_manager_unittest.cc b/media/audio/audio_manager_unittest.cc index 185fd53025ff61..8c6cc10b423426 100644 --- a/media/audio/audio_manager_unittest.cc +++ b/media/audio/audio_manager_unittest.cc @@ -115,6 +115,9 @@ class AudioManagerTest #if defined(USE_ALSA) || defined(USE_PULSEAUDIO) template void CreateAudioManagerForTesting() { + // Only one AudioManager may exist at a time, so destroy the one we're + // currently holding before creating a new one. + audio_manager_.reset(); audio_manager_.reset(T::Create(&fake_audio_log_factory_)); } #endif