Stop using next_packet_sequence_number_length in QuicPacketCreator.

net/quic/core/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/core/quic_connection.h"
 
 #include <string.h>
 #include <sys/types.h>
 
 #include <algorithm>
@@ skipping 1663 matching lines @@
     if (IsRetransmittable(*packet) == HAS_RETRANSMITTABLE_DATA &&
         last_send_for_timeout_ <= time_of_last_received_packet_) {
       last_send_for_timeout_ = packet_send_time;
     }
   }
   SetPingAlarm();
   MaybeSetMtuAlarm();
   DVLOG(1) << ENDPOINT << "time we began writing last sent packet: "
            << packet_send_time.ToDebuggingValue();
 
-  if (!FLAGS_quic_simple_packet_number_length) {
+  if (!FLAGS_quic_simple_packet_number_length_2) {
     // 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.
     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(
       packet, packet->original_path_id, packet->original_packet_number,
       packet_send_time, packet->transmission_type, IsRetransmittable(*packet));
 
   if (reset_retransmission_alarm || !retransmission_alarm_->IsSet()) {
     SetRetransmissionAlarm();
   }
 
-  if (FLAGS_quic_simple_packet_number_length) {
+  if (FLAGS_quic_simple_packet_number_length_2) {
     // The packet number length must be updated after OnPacketSent, because it
     // may change the packet number length in packet.
     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),
@@ skipping 833 matching lines @@
 
 void QuicConnection::CheckIfApplicationLimited() {
   if (queued_packets_.empty() &&
       !sent_packet_manager_->HasPendingRetransmissions() &&
       !visitor_->WillingAndAbleToWrite()) {
     sent_packet_manager_->OnApplicationLimited();
   }
 }
 
 }  // namespace net