Adds COM init to AudioManager thread for Windows

media/audio/audio_manager_base.cc

Index: media/audio/audio_manager_base.cc
diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc
index 435cf9ee8c677ac4aa09f9f4490d40e366e75904..72f0834c4a271d863a401d4af1fe5dbccb100b33 100644
--- a/media/audio/audio_manager_base.cc
+++ b/media/audio/audio_manager_base.cc
@@ -39,6 +39,24 @@ static const int kMaxInputChannels = 2;
 const char AudioManagerBase::kDefaultDeviceName[] = "Default";
 const char AudioManagerBase::kDefaultDeviceId[] = "default";
 
+AudioThread::AudioThread(const char* name)
+  : base::Thread(name) {

[scherkus (not reviewing), 2012/09/17 16:23:48]

fix indent

[henrika (OOO until Aug 14), 2012/09/17 16:43:29]

Done.

+}
+
+AudioThread::~AudioThread() {
+  Stop();
+}
+
+void AudioThread::Init() {
+  using base::win::ScopedCOMInitializer;

[DaleCurtis, 2012/09/17 15:57:16]

This needs an IF (OS_WIN) block right?

[henrika (OOO until Aug 14), 2012/09/17 16:43:29]

No. As Tommi says; only adds one byte on other platforms. It's magic ;-)

+  com_initializer_.reset(new ScopedCOMInitializer(ScopedCOMInitializer::kMTA));
+  CHECK(com_initializer_->succeeded());
+}
+
+void AudioThread::CleanUp() {
+  com_initializer_.reset();
+}
+
 AudioManagerBase::AudioManagerBase()
     : num_active_input_streams_(0),
       max_num_output_streams_(kDefaultMaxOutputStreams),
@@ -63,7 +81,7 @@ AudioManagerBase::~AudioManagerBase() {
 void AudioManagerBase::Init() {
   base::AutoLock lock(audio_thread_lock_);
   DCHECK(!audio_thread_.get());
-  audio_thread_.reset(new base::Thread("AudioThread"));
+  audio_thread_.reset(new media::AudioThread("AudioThread"));

[scherkus (not reviewing), 2012/09/17 16:23:48]

nit: if you don't need to pass in multiple names for the thread I'd simply
remove the ctor param + inline the thread name

   CHECK(audio_thread_->Start());
 }
 
@@ -228,7 +246,7 @@ bool AudioManagerBase::IsRecordingInProcess() {
 void AudioManagerBase::Shutdown() {
   // To avoid running into deadlocks while we stop the thread, shut it down
   // via a local variable while not holding the audio thread lock.
-  scoped_ptr<base::Thread> audio_thread;
+  scoped_ptr<media::AudioThread> audio_thread;
   {
     base::AutoLock lock(audio_thread_lock_);
     audio_thread_.swap(audio_thread);