QUIC - clean up changes to keep internal source and chromium code in sync.

net/quic/quic_connection.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/quic_connection.h"
 
 #include <string.h>
 #include <sys/types.h>
 
 #include <algorithm>
@@ skipping 717 matching lines @@
   if (!ValidateAckFrame(incoming_ack)) {
     SendConnectionClose(QUIC_INVALID_ACK_DATA);
     return false;
   }
 
   if (FLAGS_quic_process_frames_inline) {
     ProcessAckFrame(incoming_ack);
     if (incoming_ack.is_truncated) {
       should_last_packet_instigate_acks_ = true;
     }
-    QuicPacketSequenceNumber least_acked = GetLeastUnacked();
-    if (least_acked > 0 &&
-        (incoming_ack.missing_packets.empty() ||
-         least_acked > *incoming_ack.missing_packets.begin())) {
+    if (!incoming_ack.missing_packets.empty() &&
+        GetLeastUnacked() > *incoming_ack.missing_packets.begin()) {
       ++stop_waiting_count_;
     } else {
       stop_waiting_count_ = 0;
     }
   } else {
     last_ack_frames_.push_back(incoming_ack);
   }
   return connected_;
 }
 
@@ skipping 1630 matching lines @@
       sequence_number_of_last_sent_packet_ + packets_between_mtu_probes_ + 1;
   ++mtu_probe_count_;
 
   DVLOG(2) << "Sending a path MTU discovery packet #" << mtu_probe_count_;
   SendMtuDiscoveryPacket(mtu_discovery_target_);
 
   DCHECK(!mtu_discovery_alarm_->IsSet());
 }
 
 }  // namespace net