| Index: media/mojo/services/test_mojo_media_client.cc
|
| diff --git a/media/mojo/services/test_mojo_media_client.cc b/media/mojo/services/test_mojo_media_client.cc
|
| index a9b1a31fc4892be15d19640f419df4d043fd5b31..4b11fd70131eab5d7f1a49b71c9d5b85fc774c6c 100644
|
| --- a/media/mojo/services/test_mojo_media_client.cc
|
| +++ b/media/mojo/services/test_mojo_media_client.cc
|
| @@ -24,7 +24,14 @@ namespace media {
|
|
|
| TestMojoMediaClient::TestMojoMediaClient() {}
|
|
|
| -TestMojoMediaClient::~TestMojoMediaClient() {}
|
| +TestMojoMediaClient::~TestMojoMediaClient() {
|
| + DVLOG(1) << __FUNCTION__;
|
| + // 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();
|
| +}
|
|
|
| void TestMojoMediaClient::Initialize() {
|
| InitializeMediaLibrary();
|
| @@ -39,16 +46,6 @@ void TestMojoMediaClient::Initialize() {
|
| // Flush the message loop to ensure that the audio manager is initialized.
|
| base::RunLoop().RunUntilIdle();
|
| }
|
| -
|
| -}
|
| -
|
| -void TestMojoMediaClient::WillQuit() {
|
| - DVLOG(1) << __FUNCTION__;
|
| - // 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();
|
| }
|
|
|
| scoped_refptr<AudioRendererSink> TestMojoMediaClient::CreateAudioRendererSink(
|
|
|