Internal QUICHE change

PiperOrigin-RevId: 314366611
Change-Id: Ieb6238fcfc9c7f49e1c786aa58e3932e3a67483c

quic/core/quic_sent_packet_manager.cc

diff --git a/quic/core/quic_sent_packet_manager.cc b/quic/core/quic_sent_packet_manager.cc
index 2c3ac9d..6970af7 100644
--- a/quic/core/quic_sent_packet_manager.cc
+++ b/quic/core/quic_sent_packet_manager.cc
@@ -464,7 +464,7 @@
         unacked_packets_.RemoveFromInFlight(&*it);
       }
       if (unacked_packets_.HasRetransmittableFrames(*it)) {
-        MarkForRetransmission(packet_number, ALL_INITIAL_RETRANSMISSION);
+        MarkForRetransmission(packet_number, ALL_ZERO_RTT_RETRANSMISSION);
       }
     }
   }

quic/core/quic_types.cc

diff --git a/quic/core/quic_types.cc b/quic/core/quic_types.cc
index 3b3f725..72adeed 100644
--- a/quic/core/quic_types.cc
+++ b/quic/core/quic_types.cc
@@ -173,7 +173,7 @@
   switch (transmission_type) {
     RETURN_STRING_LITERAL(NOT_RETRANSMISSION);
     RETURN_STRING_LITERAL(HANDSHAKE_RETRANSMISSION);
-    RETURN_STRING_LITERAL(ALL_INITIAL_RETRANSMISSION);
+    RETURN_STRING_LITERAL(ALL_ZERO_RTT_RETRANSMISSION);
     RETURN_STRING_LITERAL(LOSS_RETRANSMISSION);
     RETURN_STRING_LITERAL(RTO_RETRANSMISSION);
     RETURN_STRING_LITERAL(TLP_RETRANSMISSION);

quic/core/quic_types.h

diff --git a/quic/core/quic_types.h b/quic/core/quic_types.h
index 7d5930b..3ab0ba0 100644
--- a/quic/core/quic_types.h
+++ b/quic/core/quic_types.h
@@ -163,13 +163,14 @@
 enum TransmissionType : int8_t {
   NOT_RETRANSMISSION,
   FIRST_TRANSMISSION_TYPE = NOT_RETRANSMISSION,
-  HANDSHAKE_RETRANSMISSION,  // Retransmits due to handshake timeouts.
-  ALL_INITIAL_RETRANSMISSION,  // Retransmits all initially encrypted packets.
-  LOSS_RETRANSMISSION,         // Retransmits due to loss detection.
-  RTO_RETRANSMISSION,          // Retransmits due to retransmit time out.
-  TLP_RETRANSMISSION,          // Tail loss probes.
-  PTO_RETRANSMISSION,          // Retransmission due to probe timeout.
-  PROBING_RETRANSMISSION,      // Retransmission in order to probe bandwidth.
+  HANDSHAKE_RETRANSMISSION,     // Retransmits due to handshake timeouts.
+  ALL_ZERO_RTT_RETRANSMISSION,  // Retransmits all packets encrypted with 0-RTT
+                                // key.
+  LOSS_RETRANSMISSION,          // Retransmits due to loss detection.
+  RTO_RETRANSMISSION,           // Retransmits due to retransmit time out.
+  TLP_RETRANSMISSION,           // Tail loss probes.
+  PTO_RETRANSMISSION,           // Retransmission due to probe timeout.
+  PROBING_RETRANSMISSION,       // Retransmission in order to probe bandwidth.
   LAST_TRANSMISSION_TYPE = PROBING_RETRANSMISSION,
 };
 

quic/core/quic_utils.cc

diff --git a/quic/core/quic_utils.cc b/quic/core/quic_utils.cc
index 1b736da..e4ae863 100644
--- a/quic/core/quic_utils.cc
+++ b/quic/core/quic_utils.cc
@@ -336,7 +336,7 @@
 SentPacketState QuicUtils::RetransmissionTypeToPacketState(
     TransmissionType retransmission_type) {
   switch (retransmission_type) {
-    case ALL_INITIAL_RETRANSMISSION:
+    case ALL_ZERO_RTT_RETRANSMISSION:
       return UNACKABLE;
     case HANDSHAKE_RETRANSMISSION:
       return HANDSHAKE_RETRANSMITTED;

quic/core/quic_utils_test.cc

diff --git a/quic/core/quic_utils_test.cc b/quic/core/quic_utils_test.cc
index 812c83e..041cd98 100644
--- a/quic/core/quic_utils_test.cc
+++ b/quic/core/quic_utils_test.cc
@@ -125,7 +125,7 @@
       EXPECT_EQ(HANDSHAKE_RETRANSMITTED, state);
     } else if (i == LOSS_RETRANSMISSION) {
       EXPECT_EQ(LOST, state);
-    } else if (i == ALL_INITIAL_RETRANSMISSION) {
+    } else if (i == ALL_ZERO_RTT_RETRANSMISSION) {
       EXPECT_EQ(UNACKABLE, state);
     } else if (i == TLP_RETRANSMISSION) {
       EXPECT_EQ(TLP_RETRANSMITTED, state);