[m53 merge] Use LeastUnacked to calculate the packet number length instead of GetLeastPacketAwaited…

net/quic/quic_connection.cc

Index: net/quic/quic_connection.cc
diff --git a/net/quic/quic_connection.cc b/net/quic/quic_connection.cc
index c5290627776318ae666da1feaef253a66fc17f5a..932b0c31c5543bae8af9cccd3d5c5a90e4d71689 100644
--- a/net/quic/quic_connection.cc
+++ b/net/quic/quic_connection.cc
@@ -1685,9 +1685,17 @@ bool QuicConnection::WritePacket(SerializedPacket* packet) {
     // TODO(ianswett): Change the packet number length and other packet creator
     // options by a more explicit API than setting a struct value directly,
     // perhaps via the NetworkChangeVisitor.
-    packet_generator_.UpdateSequenceNumberLength(
-        sent_packet_manager_->GetLeastPacketAwaitedByPeer(packet->path_id),
-        sent_packet_manager_->EstimateMaxPacketsInFlight(max_packet_length()));
+    if (FLAGS_quic_least_unacked_packet_number_length) {
+      packet_generator_.UpdateSequenceNumberLength(
+          sent_packet_manager_->GetLeastUnacked(packet->path_id),
+          sent_packet_manager_->EstimateMaxPacketsInFlight(
+              max_packet_length()));
+    } else {
+      packet_generator_.UpdateSequenceNumberLength(
+          sent_packet_manager_->GetLeastPacketAwaitedByPeer(packet->path_id),
+          sent_packet_manager_->EstimateMaxPacketsInFlight(
+              max_packet_length()));
+    }
   }
 
   bool reset_retransmission_alarm = sent_packet_manager_->OnPacketSent(
@@ -1701,9 +1709,17 @@ bool QuicConnection::WritePacket(SerializedPacket* packet) {
   if (FLAGS_quic_simple_packet_number_length) {
     // The packet number length must be updated after OnPacketSent, because it
     // may change the packet number length in packet.
-    packet_generator_.UpdateSequenceNumberLength(
-        sent_packet_manager_->GetLeastPacketAwaitedByPeer(packet->path_id),
-        sent_packet_manager_->EstimateMaxPacketsInFlight(max_packet_length()));
+    if (FLAGS_quic_least_unacked_packet_number_length) {
+      packet_generator_.UpdateSequenceNumberLength(
+          sent_packet_manager_->GetLeastUnacked(packet->path_id),
+          sent_packet_manager_->EstimateMaxPacketsInFlight(
+              max_packet_length()));
+    } else {
+      packet_generator_.UpdateSequenceNumberLength(
+          sent_packet_manager_->GetLeastPacketAwaitedByPeer(packet->path_id),
+          sent_packet_manager_->EstimateMaxPacketsInFlight(
+              max_packet_length()));
+    }
   }
 
   stats_.bytes_sent += result.bytes_written;