EndToEndTest.ReceivesAndRetransmitsNack now handles reordering.

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 b7ae199de0651dab7ed8a8f9c0ecb36305f5e0f8..61b75af315405e4f8ad74dcfd1f720a9242f6b1d 100644
--- a/webrtc/video/end_to_end_tests.cc
+++ b/webrtc/video/end_to_end_tests.cc
@@ -471,13 +471,14 @@ TEST_P(EndToEndTest, ReceivesAndRetransmitsNack) {
       if (dropped_packets_.find(header.sequenceNumber) !=
           dropped_packets_.end()) {
         retransmitted_packets_.insert(header.sequenceNumber);
-        if (nacks_left_ <= 0 &&
-            retransmitted_packets_.size() == dropped_packets_.size()) {
-          observation_complete_.Set();
-        }
         return SEND_PACKET;
       }
 
+      if (nacks_left_ <= 0 &&
+          retransmitted_packets_.size() == dropped_packets_.size()) {
+        observation_complete_.Set();
+      }
+
       ++sent_rtp_packets_;
 
       // Enough NACKs received, stop dropping packets.