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..761481932423ce46f3542b885bfe64484f144875 100644 |
--- a/media/audio/android/audio_android_unittest.cc |
+++ b/media/audio/android/audio_android_unittest.cc |
@@ -415,8 +415,10 @@ 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 {} |
@@ -561,7 +563,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_; |