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

Unified Diff: media/audio/win/audio_low_latency_input_win_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: MTA -> STA 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
Index: media/audio/win/audio_low_latency_input_win_unittest.cc
diff --git a/media/audio/win/audio_low_latency_input_win_unittest.cc b/media/audio/win/audio_low_latency_input_win_unittest.cc
index 976c462e8183949820ec3d2b8b9ea3b6c597404d..8f6b3ce2daa1f062a2e0f414ec54d4e19e123a81 100644
--- a/media/audio/win/audio_low_latency_input_win_unittest.cc
+++ b/media/audio/win/audio_low_latency_input_win_unittest.cc
@@ -22,7 +22,6 @@
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-using base::win::ScopedCOMInitializer;
using ::testing::_;
using ::testing::AnyNumber;
using ::testing::AtLeast;
@@ -163,8 +162,7 @@ static bool HasCoreAudioAndInputDevices(AudioManager* audio_man) {
class AudioInputStreamWrapper {
public:
explicit AudioInputStreamWrapper(AudioManager* audio_manager)
- : com_init_(ScopedCOMInitializer::kMTA),
- audio_man_(audio_manager),
+ : audio_man_(audio_manager),
default_params_(
audio_manager->GetInputStreamParameters(
AudioManagerBase::kDefaultDeviceId)) {
@@ -207,7 +205,6 @@ class AudioInputStreamWrapper {
return ais;
}
- ScopedCOMInitializer com_init_;
AudioManager* audio_man_;
const AudioParameters default_params_;
int frames_per_buffer_;
@@ -260,8 +257,6 @@ TEST(WinAudioInputTest, WASAPIAudioInputStreamHardwareSampleRate) {
scoped_ptr<AudioManager> audio_manager(AudioManager::CreateForTesting());
ABORT_AUDIO_TEST_IF_NOT(HasCoreAudioAndInputDevices(audio_manager.get()));
- ScopedCOMInitializer com_init(ScopedCOMInitializer::kMTA);
-
// Retrieve a list of all available input devices.
media::AudioDeviceNames device_names;
audio_manager->GetAudioInputDeviceNames(&device_names);
« no previous file with comments | « media/audio/win/audio_device_listener_win_unittest.cc ('k') | media/audio/win/audio_low_latency_output_win_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698