Index: media/audio/android/audio_android_unittest.cc |
diff --git a/media/audio/android/audio_android_unittest.cc b/media/audio/android/audio_android_unittest.cc |
index a918a101b5d92ee07529abe5b5e537a64510fd07..8079c166ce62b4773911abf16ca7176e0cbd0f65 100644 |
--- a/media/audio/android/audio_android_unittest.cc |
+++ b/media/audio/android/audio_android_unittest.cc |
@@ -415,11 +415,16 @@ class AudioAndroidOutputTest : public testing::Test { |
public: |
AudioAndroidOutputTest() |
: loop_(new base::MessageLoopForUI()), |
- audio_manager_(AudioManager::CreateForTesting()), |
+ audio_manager_(AudioManager::CreateForTesting(loop_->task_runner())), |
audio_output_stream_(NULL) { |
+ // Flush the message loop to ensure that AudioManager is fully initialized. |
+ loop_->RunUntilIdle(); |
} |
- ~AudioAndroidOutputTest() override {} |
+ ~AudioAndroidOutputTest() override { |
+ audio_manager_.reset(); |
+ loop_->RunUntilIdle(); |
+ } |
protected: |
AudioManager* audio_manager() { return audio_manager_.get(); } |
@@ -561,7 +566,7 @@ class AudioAndroidOutputTest : public testing::Test { |
} |
scoped_ptr<base::MessageLoopForUI> loop_; |
- scoped_ptr<AudioManager> audio_manager_; |
+ ScopedAudioManagerPtr audio_manager_; |
AudioParameters audio_output_parameters_; |
AudioOutputStream* audio_output_stream_; |
base::TimeTicks start_time_; |