Replace AudioManager::Init() with InitializeOnAudioThread().

media/audio/audio_manager_base.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/audio/audio_manager_base.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop_proxy.h"
 #include "base/threading/thread.h"
@@ skipping 26 matching lines @@
 static const int kMaxInputChannels = 2;
 
 const char AudioManagerBase::kDefaultDeviceName[] = "Default";
 const char AudioManagerBase::kDefaultDeviceId[] = "default";
 
 AudioManagerBase::AudioManagerBase()
     : num_active_input_streams_(0),
       max_num_output_streams_(kDefaultMaxOutputStreams),
       max_num_input_streams_(kDefaultMaxInputStreams),
       num_output_streams_(0),
-      num_input_streams_(0) {
+      num_input_streams_(0),
+      audio_thread_(new base::Thread("AudioThread")) {
+#if defined(OS_WIN)
+  audio_thread_->init_com_with_mta(true);
+#endif
+  CHECK(audio_thread_->Start());
+  message_loop_ = audio_thread_->message_loop_proxy();
+  message_loop_->PostTask(FROM_HERE, base::Bind(
+      &AudioManagerBase::InitializeOnAudioThread, base::Unretained(this)));
 }
 
 AudioManagerBase::~AudioManagerBase() {
   // The platform specific AudioManager implementation must have already
   // stopped the audio thread. Otherwise, we may destroy audio streams before
   // stopping the thread, resulting an unexpected behavior.
   // This way we make sure activities of the audio streams are all stopped
   // before we destroy them.
   CHECK(!audio_thread_.get());
   // All the output streams should have been deleted.
   DCHECK_EQ(0, num_output_streams_);
   // All the input streams should have been deleted.
   DCHECK_EQ(0, num_input_streams_);
 }
 
-void AudioManagerBase::Init() {
-  base::AutoLock lock(audio_thread_lock_);
-  DCHECK(!audio_thread_.get());
-  audio_thread_.reset(new base::Thread("AudioThread"));
-#if defined(OS_WIN)
-  audio_thread_->init_com_with_mta(true);
-#endif
-  CHECK(audio_thread_->Start());
-  message_loop_ = audio_thread_->message_loop_proxy();
+void AudioManagerBase::InitializeOnAudioThread() {
+  DCHECK(message_loop_->BelongsToCurrentThread());
 }
 
 string16 AudioManagerBase::GetAudioInputDeviceModel() {
   return string16();
 }
 
 scoped_refptr<base::MessageLoopProxy> AudioManagerBase::GetMessageLoop() {
   base::AutoLock lock(audio_thread_lock_);
   // Don't return |message_loop_| here because we don't want any new tasks to
   // come in once we've started tearing down the audio thread.
@@ skipping 254 matching lines @@
   output_listeners_.RemoveObserver(listener);
 }
 
 void AudioManagerBase::NotifyAllOutputDeviceChangeListeners() {
   DCHECK(message_loop_->BelongsToCurrentThread());
   DVLOG(1) << "Firing OnDeviceChange() notifications.";
   FOR_EACH_OBSERVER(AudioDeviceListener, output_listeners_, OnDeviceChange());
 }
 
 }  // namespace media