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

Unified Diff: media/audio/audio_input_volume_unittest.cc

Issue 1130753005: Get audio_unittests passing with h/w on windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « no previous file | media/audio/audio_manager.cc » ('j') | media/audio/audio_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_input_volume_unittest.cc
diff --git a/media/audio/audio_input_volume_unittest.cc b/media/audio/audio_input_volume_unittest.cc
index d6ee313bc250a6ede92bc0b95f90598aa3386061..3fa1f40b907dcbb4e9e0ec4ec8279e1cf1b99889 100644
--- a/media/audio/audio_input_volume_unittest.cc
+++ b/media/audio/audio_input_volume_unittest.cc
@@ -38,13 +38,7 @@ double GetVolumeAfterSetVolumeOnLinux(AudioInputStream* ais,
class AudioInputVolumeTest : public ::testing::Test {
protected:
- AudioInputVolumeTest()
- : audio_manager_(AudioManager::CreateForTesting())
-#if defined(OS_WIN)
- , com_init_(base::win::ScopedCOMInitializer::kMTA)
-#endif
- {
- }
+ AudioInputVolumeTest() : audio_manager_(AudioManager::CreateForTesting()) {}
bool HasCoreAudioAndInputDevices() {
#if defined(OS_WIN)
@@ -87,10 +81,6 @@ class AudioInputVolumeTest : public ::testing::Test {
}
scoped_ptr<AudioManager> audio_manager_;
-
-#if defined(OS_WIN)
- base::win::ScopedCOMInitializer com_init_;
-#endif
};
#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
« no previous file with comments | « no previous file | media/audio/audio_manager.cc » ('j') | media/audio/audio_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698