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

media/audio/audio_manager.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.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/debug/alias.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/power_monitor/power_monitor.h"
-#include "base/synchronization/waitable_event.h"
 #include "build/build_config.h"
 #include "media/audio/fake_audio_log_factory.h"
 
 namespace media {
 namespace {
 AudioManager* g_last_created = NULL;
 
 // Maximum number of failed pings to the audio thread allowed. A crash will be
 // issued once this count is reached.  We require at least two pings before
 // crashing to ensure unobservable power events aren't mistakenly caught (e.g.,
@@ skipping 126 matching lines @@
   // On OSX the audio thread is the UI thread, for which a hang monitor is not
   // necessary.
 #if !defined(OS_MACOSX)
   g_helper.Pointer()->StartHangTimer(monitor_task_runner);
 #endif
   return manager;
 }
 
 // static
 AudioManager* AudioManager::CreateForTesting() {
-  AudioManager* manager = Create(g_helper.Pointer()->fake_log_factory());
-
-  // When created for testing, always ensure all methods are ready to run (even
-  // if they end up called from other threads.
-  if (!manager->GetTaskRunner()->BelongsToCurrentThread()) {
-    base::WaitableEvent event(false, false);
-    manager->GetTaskRunner()->PostTask(
-        FROM_HERE,
-        base::Bind(&base::WaitableEvent::Signal, base::Unretained(&event)));
-    event.Wait();
-  }
-
-  return manager;
+  return Create(g_helper.Pointer()->fake_log_factory());
 }
 
 // static
 AudioManager* AudioManager::Get() {
   return g_last_created;
 }
 
 }  // namespace media