Landing Recent QUIC changes until 10:38 AM, Oct 17, 2016 UTC-4

net/quic/core/quic_framer.cc

Index: net/quic/core/quic_framer.cc
diff --git a/net/quic/core/quic_framer.cc b/net/quic/core/quic_framer.cc
index c94749f9ec1e4ea6b8ae24039dfc99489bb19e7e..89dd2a60dc8468b06b5fbdab3ae9397cf919424d 100644
--- a/net/quic/core/quic_framer.cc
+++ b/net/quic/core/quic_framer.cc
@@ -808,28 +808,15 @@ bool QuicFramer::IsValidPath(QuicPathId path_id,
     return false;
   }
 
-  if (FLAGS_quic_packet_numbers_largest_received) {
-    if (path_id == last_path_id_) {
-      *base_packet_number = largest_packet_number_;
-      return true;
-    }
+  if (path_id == last_path_id_) {
+    *base_packet_number = largest_packet_number_;
+    return true;
+  }
 
-    if (ContainsKey(largest_packet_numbers_, path_id)) {
-      *base_packet_number = largest_packet_numbers_[path_id];
-    } else {
-      *base_packet_number = 0;
-    }
+  if (ContainsKey(largest_packet_numbers_, path_id)) {
+    *base_packet_number = largest_packet_numbers_[path_id];
   } else {
-    if (path_id == last_path_id_) {
-      *base_packet_number = last_packet_number_;
-      return true;
-    }
-
-    if (ContainsKey(last_packet_numbers_, path_id)) {
-      *base_packet_number = last_packet_numbers_[path_id];
-    } else {
-      *base_packet_number = 0;
-    }
+    *base_packet_number = 0;
   }
 
   return true;
@@ -839,23 +826,18 @@ void QuicFramer::SetLastPacketNumber(const QuicPacketHeader& header) {
   if (header.public_header.multipath_flag && header.path_id != last_path_id_) {
     if (last_path_id_ != kInvalidPathId) {
       // Save current last packet number before changing path.
-      last_packet_numbers_[last_path_id_] = last_packet_number_;
-      if (FLAGS_quic_packet_numbers_largest_received) {
-        largest_packet_numbers_[last_path_id_] = largest_packet_number_;
-      }
+      largest_packet_numbers_[last_path_id_] = largest_packet_number_;
     }
     // Change path.
     last_path_id_ = header.path_id;
   }
   last_packet_number_ = header.packet_number;
-  if (FLAGS_quic_packet_numbers_largest_received) {
-    largest_packet_number_ = max(header.packet_number, largest_packet_number_);
-  }
+  largest_packet_number_ = max(header.packet_number, largest_packet_number_);
 }
 
 void QuicFramer::OnPathClosed(QuicPathId path_id) {
   closed_paths_.insert(path_id);
-  last_packet_numbers_.erase(path_id);
+  largest_packet_numbers_.erase(path_id);
 }
 
 QuicPacketNumber QuicFramer::CalculatePacketNumberFromWire(
@@ -1073,9 +1055,7 @@ bool QuicFramer::ProcessUnauthenticatedHeader(QuicDataReader* encrypted_reader,
     return RaiseError(QUIC_INVALID_PACKET_HEADER);
   }
 
-  QuicPacketNumber base_packet_number =
-      FLAGS_quic_packet_numbers_largest_received ? largest_packet_number_
-                                                 : last_packet_number_;
+  QuicPacketNumber base_packet_number = largest_packet_number_;
   if (header->public_header.multipath_flag &&
       !IsValidPath(header->path_id, &base_packet_number)) {
     // Stop processing because path is closed.