Index: media/audio/audio_input_unittest.cc |
diff --git a/media/audio/audio_input_unittest.cc b/media/audio/audio_input_unittest.cc |
index abb47ce955be1299d5fcd201869e11981120bcfa..7dcfb0ef38e515ef913f06073a249be9bfeece3c 100644 |
--- a/media/audio/audio_input_unittest.cc |
+++ b/media/audio/audio_input_unittest.cc |
@@ -50,12 +50,14 @@ class TestInputCallback : public AudioInputStream::AudioInputCallback { |
}; |
class AudioInputTest : public testing::Test { |
- public: |
- AudioInputTest() : |
- message_loop_(base::MessageLoop::TYPE_UI), |
- audio_manager_(AudioManager::CreateForTesting()), |
- audio_input_stream_(NULL) { |
- // Wait for the AudioManager to finish any initialization on the audio loop. |
+ public: |
+ AudioInputTest() |
+ : message_loop_(base::MessageLoop::TYPE_UI), |
+ audio_manager_( |
+ AudioManager::CreateForTesting(message_loop_.task_runner())), |
+ audio_input_stream_(NULL) { |
+ // Wait for the AudioManager to finish any initialization on the audio |
+ // loop. |
base::RunLoop().RunUntilIdle(); |
} |
@@ -166,7 +168,7 @@ class AudioInputTest : public testing::Test { |
} |
base::MessageLoop message_loop_; |
- scoped_ptr<AudioManager> audio_manager_; |
+ ScopedAudioManagerPtr audio_manager_; |
AudioInputStream* audio_input_stream_; |
private: |