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..5f7606063410aec7815527775b46fe1260bef763 100644 |
--- a/media/audio/audio_input_unittest.cc |
+++ b/media/audio/audio_input_unittest.cc |
@@ -16,6 +16,7 @@ |
#include "media/audio/audio_io.h" |
#include "media/audio/audio_manager_base.h" |
#include "media/audio/audio_unittest_util.h" |
+#include "media/audio/fake_audio_log_factory.h" |
#include "testing/gtest/include/gtest/gtest.h" |
namespace media { |
@@ -51,19 +52,23 @@ class TestInputCallback : public AudioInputStream::AudioInputCallback { |
class AudioInputTest : public testing::Test { |
public: |
tommi (sloooow) - chröme
2016/03/19 02:32:41
this should be indented by 1 space, but since it i
alokp
2016/03/22 21:47:06
Done.
|
- 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. |
- base::RunLoop().RunUntilIdle(); |
- } |
+ AudioInputTest() |
+ : message_loop_(base::MessageLoop::TYPE_UI), |
+ audio_manager_(AudioManager::Create(nullptr, |
+ nullptr, |
+ nullptr, |
+ &fake_audio_log_factory_)), |
+ audio_input_stream_(NULL) { |
+ // Wait for the AudioManager to finish any initialization on the audio |
+ // loop. |
+ base::RunLoop().RunUntilIdle(); |
+ } |
- ~AudioInputTest() override { base::RunLoop().RunUntilIdle(); } |
+ ~AudioInputTest() override { base::RunLoop().RunUntilIdle(); } |
- protected: |
- bool InputDevicesAvailable() { |
- return audio_manager_->HasAudioInputDevices(); |
+ protected: |
+ bool InputDevicesAvailable() { |
+ return audio_manager_->HasAudioInputDevices(); |
} |
void MakeAudioInputStreamOnAudioThread() { |
@@ -166,7 +171,8 @@ class AudioInputTest : public testing::Test { |
} |
base::MessageLoop message_loop_; |
- scoped_ptr<AudioManager> audio_manager_; |
+ FakeAudioLogFactory fake_audio_log_factory_; |
+ ScopedAudioManagerPtr audio_manager_; |
AudioInputStream* audio_input_stream_; |
private: |