Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(864)

Unified Diff: media/audio/audio_manager_unittest.cc

Issue 1097553003: Switch to STA mode for audio thread and WASAPI I/O streams. (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Simplify. Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/audio/audio_manager_unittest.cc
diff --git a/media/audio/audio_manager_unittest.cc b/media/audio/audio_manager_unittest.cc
index 26c110e3adef7202d88c34806543b47f32e349ec..e876dd173759517168a93767bcd5ff673f438a9e 100644
--- a/media/audio/audio_manager_unittest.cc
+++ b/media/audio/audio_manager_unittest.cc
@@ -33,19 +33,7 @@ namespace media {
// Windows.
class AudioManagerTest : public ::testing::Test {
protected:
- 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();
- }
+ AudioManagerTest() : audio_manager_(AudioManager::CreateForTesting()) {}
#if defined(OS_WIN)
bool SetMMDeviceEnumeration() {
@@ -55,13 +43,13 @@ class AudioManagerTest : public ::testing::Test {
if (amw->enumeration_type() == AudioManagerWin::kWaveEnumeration)
return false;
- amw->SetEnumerationType(AudioManagerWin::kMMDeviceEnumeration);
+ amw->set_enumeration_type(AudioManagerWin::kMMDeviceEnumeration);
return true;
}
void SetWaveEnumeration() {
AudioManagerWin* amw = static_cast<AudioManagerWin*>(audio_manager_.get());
- amw->SetEnumerationType(AudioManagerWin::kWaveEnumeration);
+ amw->set_enumeration_type(AudioManagerWin::kWaveEnumeration);
}
std::string GetDeviceIdFromPCMWaveInAudioInputStream(

Powered by Google App Engine
This is Rietveld 408576698