Delete deprecated CreateAudioSource method, with constraints.
Bug: webrtc:9239
Change-Id: I5025b7fd103247e0426ceabedc1216a4f0f0ab34
Reviewed-on: https://webrtc-review.googlesource.com/76560
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23501}
diff --git a/pc/localaudiosource_unittest.cc b/pc/localaudiosource_unittest.cc
index bf566c6..b2d87ae 100644
--- a/pc/localaudiosource_unittest.cc
+++ b/pc/localaudiosource_unittest.cc
@@ -22,75 +22,6 @@
using webrtc::MediaConstraintsInterface;
using webrtc::MediaSourceInterface;
-TEST(LocalAudioSourceTest, SetValidOptions) {
- webrtc::FakeConstraints constraints;
- constraints.AddMandatory(
- MediaConstraintsInterface::kGoogEchoCancellation, false);
- constraints.AddOptional(
- MediaConstraintsInterface::kExtendedFilterEchoCancellation, true);
- constraints.AddOptional(MediaConstraintsInterface::kDAEchoCancellation, true);
- constraints.AddOptional(MediaConstraintsInterface::kAutoGainControl, true);
- constraints.AddOptional(
- MediaConstraintsInterface::kExperimentalAutoGainControl, true);
- constraints.AddMandatory(MediaConstraintsInterface::kNoiseSuppression, false);
- constraints.AddOptional(MediaConstraintsInterface::kHighpassFilter, true);
-
- rtc::scoped_refptr<LocalAudioSource> source =
- LocalAudioSource::Create(&constraints);
-
- EXPECT_EQ(false, source->options().echo_cancellation);
- EXPECT_EQ(true, source->options().extended_filter_aec);
- EXPECT_EQ(true, source->options().delay_agnostic_aec);
- EXPECT_EQ(true, source->options().auto_gain_control);
- EXPECT_EQ(true, source->options().experimental_agc);
- EXPECT_EQ(false, source->options().noise_suppression);
- EXPECT_EQ(true, source->options().highpass_filter);
-}
-
-TEST(LocalAudioSourceTest, OptionNotSet) {
- webrtc::FakeConstraints constraints;
- rtc::scoped_refptr<LocalAudioSource> source =
- LocalAudioSource::Create(&constraints);
- EXPECT_EQ(rtc::nullopt, source->options().highpass_filter);
-}
-
-TEST(LocalAudioSourceTest, MandatoryOverridesOptional) {
- webrtc::FakeConstraints constraints;
- constraints.AddMandatory(
- MediaConstraintsInterface::kGoogEchoCancellation, false);
- constraints.AddOptional(
- MediaConstraintsInterface::kGoogEchoCancellation, true);
-
- rtc::scoped_refptr<LocalAudioSource> source =
- LocalAudioSource::Create(&constraints);
-
- EXPECT_EQ(false, source->options().echo_cancellation);
-}
-
-TEST(LocalAudioSourceTest, InvalidOptional) {
- webrtc::FakeConstraints constraints;
- constraints.AddOptional(MediaConstraintsInterface::kHighpassFilter, false);
- constraints.AddOptional("invalidKey", false);
-
- rtc::scoped_refptr<LocalAudioSource> source =
- LocalAudioSource::Create(&constraints);
-
- EXPECT_EQ(MediaSourceInterface::kLive, source->state());
- EXPECT_EQ(false, source->options().highpass_filter);
-}
-
-TEST(LocalAudioSourceTest, InvalidMandatory) {
- webrtc::FakeConstraints constraints;
- constraints.AddMandatory(MediaConstraintsInterface::kHighpassFilter, false);
- constraints.AddMandatory("invalidKey", false);
-
- rtc::scoped_refptr<LocalAudioSource> source =
- LocalAudioSource::Create(&constraints);
-
- EXPECT_EQ(MediaSourceInterface::kLive, source->state());
- EXPECT_EQ(false, source->options().highpass_filter);
-}
-
TEST(LocalAudioSourceTest, InitWithAudioOptions) {
cricket::AudioOptions audio_options;
audio_options.highpass_filter = true;
@@ -101,6 +32,6 @@
TEST(LocalAudioSourceTest, InitWithNoOptions) {
rtc::scoped_refptr<LocalAudioSource> source =
- LocalAudioSource::Create((cricket::AudioOptions*)nullptr);
+ LocalAudioSource::Create(nullptr);
EXPECT_EQ(rtc::nullopt, source->options().highpass_filter);
}