Revert of Switch to STA mode for audio thread and WASAPI I/O streams.

media/audio/audio_manager_unittest.cc

 // Copyright 2013 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 "base/bind.h"
 #include "base/environment.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/waitable_event.h"
 #include "media/audio/audio_manager.h"
@@ skipping 15 matching lines @@
 #if defined(USE_PULSEAUDIO)
 #include "media/audio/pulse/audio_manager_pulse.h"
 #endif  // defined(USE_PULSEAUDIO)
 
 namespace media {
 
 // Test fixture which allows us to override the default enumeration API on
 // Windows.
 class AudioManagerTest : public ::testing::Test {
  protected:
-  AudioManagerTest() : audio_manager_(AudioManager::CreateForTesting()) {}
+  AudioManagerTest()
+      : audio_manager_(AudioManager::CreateForTesting())
+#if defined(OS_WIN)
+      , com_init_(base::win::ScopedCOMInitializer::kMTA)
+#endif
+  {
+    // Wait for audio thread initialization to complete.  Otherwise the
+    // enumeration type may not have been set yet.
+    base::WaitableEvent event(false, false);
+    audio_manager_->GetTaskRunner()->PostTask(FROM_HERE, base::Bind(
+        &base::WaitableEvent::Signal, base::Unretained(&event)));
+    event.Wait();
+  }
 
 #if defined(OS_WIN)
   bool SetMMDeviceEnumeration() {
     AudioManagerWin* amw = static_cast<AudioManagerWin*>(audio_manager_.get());
     // Windows Wave is used as default if Windows XP was detected =>
     // return false since MMDevice is not supported on XP.
     if (amw->enumeration_type() == AudioManagerWin::kWaveEnumeration)
       return false;
 
-    amw->set_enumeration_type(AudioManagerWin::kMMDeviceEnumeration);
+    amw->SetEnumerationType(AudioManagerWin::kMMDeviceEnumeration);
     return true;
   }
 
   void SetWaveEnumeration() {
     AudioManagerWin* amw = static_cast<AudioManagerWin*>(audio_manager_.get());
-    amw->set_enumeration_type(AudioManagerWin::kWaveEnumeration);
+    amw->SetEnumerationType(AudioManagerWin::kWaveEnumeration);
   }
 
   std::string GetDeviceIdFromPCMWaveInAudioInputStream(
       const std::string& device_id) {
     AudioManagerWin* amw = static_cast<AudioManagerWin*>(audio_manager_.get());
     AudioParameters parameters(
         AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO,
         AudioParameters::kAudioCDSampleRate, 16,
         1024);
     scoped_ptr<PCMWaveInAudioInputStream> stream(
@@ skipping 296 matching lines @@
       DVLOG(2) << it->unique_id << " matches with " << output_device_id;
       found_an_associated_device = true;
     }
   }
 
   EXPECT_TRUE(found_an_associated_device);
 #endif  // defined(OS_WIN) || defined(OS_MACOSX)
 }
 
 }  // namespace media