commit 577718a9028c79644266451f9e282c9966e2c3ab
author QUICHE team <quiche-dev@google.com> Wed Mar 20 09:00:59 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Mar 20 10:21:37 2019 -0700
tree 4286de8fd183e30d9987b2721aaf3c39b20a475e
parent 1f3de24d892f717c37424bcb4ce6bd4c88eb53cd

gfe-relnote: Deprecate gfe2_restart_flag_quic_uint64max_uninitialized_pn.

PiperOrigin-RevId: 239406856
Change-Id: If9019c232ee3a37cf5bbdf4e0cae996346d7ba77

quic/core/quic_packet_number.cc

diff --git a/quic/core/quic_packet_number.cc b/quic/core/quic_packet_number.cc
index 3996993..345a056 100644
--- a/quic/core/quic_packet_number.cc
+++ b/quic/core/quic_packet_number.cc
@@ -47,11 +47,7 @@
 QuicPacketNumber& QuicPacketNumber::operator++() {
 #ifndef NDEBUG
   DCHECK(IsInitialized());
-  if (GetQuicRestartFlag(quic_uint64max_uninitialized_pn)) {
-    DCHECK_LT(ToUint64(), std::numeric_limits<uint64_t>::max() - 1);
-  } else {
-    DCHECK_LT(ToUint64(), std::numeric_limits<uint64_t>::max());
-  }
+  DCHECK_LT(ToUint64(), std::numeric_limits<uint64_t>::max() - 1);
 #endif
   packet_number_++;
   return *this;
@@ -60,11 +56,7 @@
 QuicPacketNumber QuicPacketNumber::operator++(int) {
 #ifndef NDEBUG
   DCHECK(IsInitialized());
-  if (GetQuicRestartFlag(quic_uint64max_uninitialized_pn)) {
-    DCHECK_LT(ToUint64(), std::numeric_limits<uint64_t>::max() - 1);
-  } else {
-    DCHECK_LT(ToUint64(), std::numeric_limits<uint64_t>::max());
-  }
+  DCHECK_LT(ToUint64(), std::numeric_limits<uint64_t>::max() - 1);
 #endif
   QuicPacketNumber previous(*this);
   packet_number_++;
@@ -74,11 +66,7 @@
 QuicPacketNumber& QuicPacketNumber::operator--() {
 #ifndef NDEBUG
   DCHECK(IsInitialized());
-  if (GetQuicRestartFlag(quic_uint64max_uninitialized_pn)) {
-    DCHECK_GE(ToUint64(), 1UL);
-  } else {
-    DCHECK_GT(ToUint64(), 1UL);
-  }
+  DCHECK_GE(ToUint64(), 1UL);
 #endif
   packet_number_--;
   return *this;
@@ -87,11 +75,7 @@
 QuicPacketNumber QuicPacketNumber::operator--(int) {
 #ifndef NDEBUG
   DCHECK(IsInitialized());
-  if (GetQuicRestartFlag(quic_uint64max_uninitialized_pn)) {
-    DCHECK_GE(ToUint64(), 1UL);
-  } else {
-    DCHECK_GT(ToUint64(), 1UL);
-  }
+  DCHECK_GE(ToUint64(), 1UL);
 #endif
   QuicPacketNumber previous(*this);
   packet_number_--;
@@ -101,11 +85,7 @@
 QuicPacketNumber& QuicPacketNumber::operator+=(uint64_t delta) {
 #ifndef NDEBUG
   DCHECK(IsInitialized());
-  if (GetQuicRestartFlag(quic_uint64max_uninitialized_pn)) {
-    DCHECK_GT(std::numeric_limits<uint64_t>::max() - ToUint64(), delta);
-  } else {
-    DCHECK_GE(std::numeric_limits<uint64_t>::max() - ToUint64(), delta);
-  }
+  DCHECK_GT(std::numeric_limits<uint64_t>::max() - ToUint64(), delta);
 #endif
   packet_number_ += delta;
   return *this;
@@ -114,11 +94,7 @@
 QuicPacketNumber& QuicPacketNumber::operator-=(uint64_t delta) {
 #ifndef NDEBUG
   DCHECK(IsInitialized());
-  if (GetQuicRestartFlag(quic_uint64max_uninitialized_pn)) {
-    DCHECK_GE(ToUint64(), delta);
-  } else {
-    DCHECK_GT(ToUint64(), delta);
-  }
+  DCHECK_GE(ToUint64(), delta);
 #endif
   packet_number_ -= delta;
   return *this;
@@ -135,9 +111,7 @@
 
 // static
 uint64_t QuicPacketNumber::UninitializedPacketNumber() {
-  return GetQuicRestartFlag(quic_uint64max_uninitialized_pn)
-             ? std::numeric_limits<uint64_t>::max()
-             : 0;
+  return std::numeric_limits<uint64_t>::max();
 }
 
 }  // namespace quic