Revert of Fix flaky EndToEndTest.TransportSeqNumOnAudioAndVideo

webrtc/video/end_to_end_tests.cc

Index: webrtc/video/end_to_end_tests.cc
diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc
index 01c6d8bffa8af5e53a8a4f4d4a7e3af634e6dda9..cb7edd422fa619bc9e36e1928950415b3b3208d2 100644
--- a/webrtc/video/end_to_end_tests.cc
+++ b/webrtc/video/end_to_end_tests.cc
@@ -4025,8 +4025,7 @@
 }
 
 TEST_P(EndToEndTest, TransportSeqNumOnAudioAndVideo) {
-  static constexpr int kExtensionId = 8;
-  static constexpr size_t kMinPacketsToWaitFor = 50;
+  static const int kExtensionId = 8;
   class TransportSequenceNumberTest : public test::EndToEndTest {
    public:
     TransportSequenceNumberTest()
@@ -4064,7 +4063,7 @@
       if (header.ssrc == kAudioSendSsrc)
         audio_observed_ = true;
       if (audio_observed_ && video_observed_ &&
-          received_packet_ids_.size() >= kMinPacketsToWaitFor) {
+          received_packet_ids_.size() == 50) {
         size_t packet_id_range =
             *received_packet_ids_.rbegin() - *received_packet_ids_.begin() + 1;
         EXPECT_EQ(received_packet_ids_.size(), packet_id_range);
@@ -4076,11 +4075,6 @@
     void PerformTest() override {
       EXPECT_TRUE(Wait()) << "Timed out while waiting for audio and video "
                              "packets with transport sequence number.";
-      // Double check conditions for successfull test to produce better error
-      // message when this test fail.
-      EXPECT_TRUE(video_observed_);
-      EXPECT_TRUE(audio_observed_);
-      EXPECT_GE(received_packet_ids_.size(), kMinPacketsToWaitFor);
     }
 
    private: