Removes usages of TaskQueueCongestionControl field trial.
It doesn't do anything any more, so it should be removed.
Bug: webrtc:9586
Change-Id: I0b320b6ce4f480ff8cb59451db29bcc77b882b5f
Reviewed-on: https://webrtc-review.googlesource.com/c/120813
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26507}
diff --git a/video/end_to_end_tests/transport_feedback_tests.cc b/video/end_to_end_tests/transport_feedback_tests.cc
index 7588e02..cc0cb7b 100644
--- a/video/end_to_end_tests/transport_feedback_tests.cc
+++ b/video/end_to_end_tests/transport_feedback_tests.cc
@@ -22,26 +22,9 @@
namespace webrtc {
-class TransportFeedbackEndToEndTest
- : public test::CallTest,
- public testing::WithParamInterface<std::string> {
- public:
- TransportFeedbackEndToEndTest() : field_trial_(GetParam()) {}
+class TransportFeedbackEndToEndTest : public test::CallTest {};
- virtual ~TransportFeedbackEndToEndTest() {
- }
-
- private:
- test::ScopedFieldTrials field_trial_;
-};
-
-INSTANTIATE_TEST_SUITE_P(
- FieldTrials,
- TransportFeedbackEndToEndTest,
- ::testing::Values("WebRTC-TaskQueueCongestionControl/Enabled/",
- "WebRTC-TaskQueueCongestionControl/Disabled/"));
-
-TEST_P(TransportFeedbackEndToEndTest, AssignsTransportSequenceNumbers) {
+TEST_F(TransportFeedbackEndToEndTest, AssignsTransportSequenceNumbers) {
static const int kExtensionId = 5;
class RtpExtensionHeaderObserver : public test::DirectTransport {
@@ -322,32 +305,32 @@
Call* receiver_call_;
};
-TEST_P(TransportFeedbackEndToEndTest, VideoReceivesTransportFeedback) {
+TEST_F(TransportFeedbackEndToEndTest, VideoReceivesTransportFeedback) {
TransportFeedbackTester test(true, 1, 0);
RunBaseTest(&test);
}
-TEST_P(TransportFeedbackEndToEndTest, VideoTransportFeedbackNotConfigured) {
+TEST_F(TransportFeedbackEndToEndTest, VideoTransportFeedbackNotConfigured) {
TransportFeedbackTester test(false, 1, 0);
RunBaseTest(&test);
}
-TEST_P(TransportFeedbackEndToEndTest, AudioReceivesTransportFeedback) {
+TEST_F(TransportFeedbackEndToEndTest, AudioReceivesTransportFeedback) {
TransportFeedbackTester test(true, 0, 1);
RunBaseTest(&test);
}
-TEST_P(TransportFeedbackEndToEndTest, AudioTransportFeedbackNotConfigured) {
+TEST_F(TransportFeedbackEndToEndTest, AudioTransportFeedbackNotConfigured) {
TransportFeedbackTester test(false, 0, 1);
RunBaseTest(&test);
}
-TEST_P(TransportFeedbackEndToEndTest, AudioVideoReceivesTransportFeedback) {
+TEST_F(TransportFeedbackEndToEndTest, AudioVideoReceivesTransportFeedback) {
TransportFeedbackTester test(true, 1, 1);
RunBaseTest(&test);
}
-TEST_P(TransportFeedbackEndToEndTest,
+TEST_F(TransportFeedbackEndToEndTest,
StopsAndResumesMediaWhenCongestionWindowFull) {
test::ScopedFieldTrials override_field_trials(
"WebRTC-CwndExperiment/Enabled-250/");
@@ -440,7 +423,7 @@
RunBaseTest(&test);
}
-TEST_P(TransportFeedbackEndToEndTest, TransportSeqNumOnAudioAndVideo) {
+TEST_F(TransportFeedbackEndToEndTest, TransportSeqNumOnAudioAndVideo) {
static constexpr int kExtensionId = 8;
static constexpr size_t kMinPacketsToWaitFor = 50;
class TransportSequenceNumberTest : public test::EndToEndTest {