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 283f248170f37b6a178b798feaf59c5b244e28f0..0247c515651034846f639bd91e1afd37e4c75891 100644 |
--- a/media/mojo/services/test_mojo_media_client.cc |
+++ b/media/mojo/services/test_mojo_media_client.cc |
@@ -4,6 +4,7 @@ |
#include "media/mojo/services/test_mojo_media_client.h" |
+#include "base/thread_task_runner_handle.h" |
#include "media/audio/audio_manager_base.h" |
#include "media/audio/audio_output_stream_sink.h" |
#include "media/base/audio_hardware_config.h" |
@@ -24,12 +25,12 @@ void TestMojoMediaClient::Initialize() { |
// TODO(dalecurtis): We should find a single owner per process for the audio |
// manager or make it a lazy instance. It's not safe to call Get()/Create() |
// across multiple threads... |
- // |
- // TODO(dalecurtis): Eventually we'll want something other than a fake audio |
- // log factory here too. We should probably at least DVLOG() such info. |
AudioManager* audio_manager = AudioManager::Get(); |
- if (!audio_manager) |
- audio_manager = media::AudioManager::Create(&fake_audio_log_factory_); |
+ if (!audio_manager) { |
+ audio_manager_ = media::AudioManager::CreateForTesting( |
+ base::ThreadTaskRunnerHandle::Get()); |
+ audio_manager = audio_manager_.get(); |
+ } |
audio_hardware_config_.reset(new AudioHardwareConfig( |
audio_manager->GetInputStreamParameters( |