| Index: webrtc/modules/audio_device/test/audio_device_test_api.cc
|
| diff --git a/webrtc/modules/audio_device/test/audio_device_test_api.cc b/webrtc/modules/audio_device/test/audio_device_test_api.cc
|
| index 2f2780685d896c4ee6aa183adfc8e165256fc2e6..0d088691efc4a21e7e3c6cd2f2f9e50cc8bbc199 100644
|
| --- a/webrtc/modules/audio_device/test/audio_device_test_api.cc
|
| +++ b/webrtc/modules/audio_device/test/audio_device_test_api.cc
|
| @@ -177,9 +177,6 @@ class AudioDeviceAPITest: public testing::Test {
|
| EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
|
| kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL);
|
| EXPECT_EQ(0, audio_device_.release()->Release());
|
| - // create non-default (=Wave Audio) instance
|
| - EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
|
| - kId, AudioDeviceModule::kWindowsWaveAudio)) != NULL);
|
| EXPECT_EQ(0, audio_device_.release()->Release());
|
| // explicitly specify usage of Core Audio (same as default)
|
| EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
|
| @@ -192,17 +189,12 @@ class AudioDeviceAPITest: public testing::Test {
|
| EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
|
| kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL);
|
| EXPECT_EQ(0, audio_device_.release()->Release());
|
| - // explicitly specify usage of Wave Audio (same as default)
|
| - EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
|
| - kId, AudioDeviceModule::kWindowsWaveAudio)) != NULL);
|
| #endif
|
| #endif
|
|
|
| #if defined(ANDROID)
|
| // Fails tests
|
| EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
|
| - kId, AudioDeviceModule::kWindowsWaveAudio)) == NULL);
|
| - EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
|
| kId, AudioDeviceModule::kWindowsCoreAudio)) == NULL);
|
| EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
|
| kId, AudioDeviceModule::kLinuxAlsaAudio)) == NULL);
|
| @@ -213,8 +205,6 @@ class AudioDeviceAPITest: public testing::Test {
|
| kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL);
|
| #elif defined(WEBRTC_LINUX)
|
| EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
|
| - kId, AudioDeviceModule::kWindowsWaveAudio)) == NULL);
|
| - EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
|
| kId, AudioDeviceModule::kWindowsCoreAudio)) == NULL);
|
| // create default implementation instance
|
| EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
|
| @@ -229,8 +219,6 @@ class AudioDeviceAPITest: public testing::Test {
|
| #if defined(WEBRTC_MAC)
|
| // Fails tests
|
| EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
|
| - kId, AudioDeviceModule::kWindowsWaveAudio)) == NULL);
|
| - EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
|
| kId, AudioDeviceModule::kWindowsCoreAudio)) == NULL);
|
| EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
|
| kId, AudioDeviceModule::kLinuxAlsaAudio)) == NULL);
|
|
|