Make VideoSendStreamTest.DoesNotUtilizeUlpfecForH264WithNackEnabled useful again.

webrtc/video/video_send_stream_tests.cc

Index: webrtc/video/video_send_stream_tests.cc
diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc
index e0f9962c6e5269a0c31c316011103050200b79fb..9bb189c14309c890f120e112203918e19dd8dd03 100644
--- a/webrtc/video/video_send_stream_tests.cc
+++ b/webrtc/video/video_send_stream_tests.cc
@@ -358,7 +358,7 @@ class UlpfecObserver : public test::EndToEndTest {
                  bool expect_ulpfec,
                  const std::string& codec,
                  VideoEncoder* encoder)
-      : EndToEndTest(VideoSendStreamTest::kDefaultTimeoutMs),
+      : EndToEndTest(kTimeoutMs),
         encoder_(encoder),
         payload_name_(codec),
         use_nack_(use_nack),
@@ -368,6 +368,10 @@ class UlpfecObserver : public test::EndToEndTest {
         sent_ulpfec_(false),
         header_extensions_enabled_(header_extensions_enabled) {}
 
+  // Some of the test cases are expected to time out and thus we are using
+  // a shorter timeout window than the default here.
+  static constexpr size_t kTimeoutMs = 10000;
+
  private:
   Action OnSendRtp(const uint8_t* packet, size_t length) override {
     RTPHeader header;
@@ -421,9 +425,8 @@ class UlpfecObserver : public test::EndToEndTest {
       }
     }
 
-    if (sent_media_) {
-      if (sent_ulpfec_ || !expect_ulpfec_)
-        observation_complete_.Set();
+    if (sent_media_ && sent_ulpfec_) {
+      observation_complete_.Set();
     }
 
     prev_header_ = header;
@@ -474,7 +477,8 @@ class UlpfecObserver : public test::EndToEndTest {
   }
 
   void PerformTest() override {
-    EXPECT_TRUE(Wait()) << "Timed out waiting for ULPFEC and/or media packets.";
+    EXPECT_EQ(expect_ulpfec_, Wait())
+        << "Timed out waiting for ULPFEC and/or media packets.";
   }
 
   std::unique_ptr<internal::TransportAdapter> transport_adapter_;