| Index: media/audio/audio_manager_base.cc
|
| diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc
|
| index edaabf4c22771e71ef38a1fba14f4969e587141e..4083d3fec312b10d61a27e713071d94b1fc167ff 100644
|
| --- a/media/audio/audio_manager_base.cc
|
| +++ b/media/audio/audio_manager_base.cc
|
| @@ -95,7 +95,15 @@ AudioManagerBase::AudioManagerBase(AudioLogFactory* audio_log_factory)
|
| }
|
| #endif
|
|
|
| +#if defined(OS_WIN)
|
| + // We check COM initializer status right after calling this, so wait here
|
| + // until we finish audio thread initialization (where we also run COM
|
| + // initializer).
|
| +// CHECK(audio_thread_.StartAndWait());
|
| + CHECK(audio_thread_.Start()); // XXX for testing
|
| +#else
|
| CHECK(audio_thread_.Start());
|
| +#endif
|
| task_runner_ = audio_thread_.message_loop_proxy();
|
| }
|
|
|
|
|