Deprecate gfe2_reloadable_flag_quic_http3_new_default_urgency_value.

PiperOrigin-RevId: 341447567
Change-Id: I619795dfdaa409aa2555e3a9fde7f10e1c9b797b

quic/core/http/quic_spdy_session_test.cc

diff --git a/quic/core/http/quic_spdy_session_test.cc b/quic/core/http/quic_spdy_session_test.cc
index 0d27288..4eb3e5c 100644
--- a/quic/core/http/quic_spdy_session_test.cc
+++ b/quic/core/http/quic_spdy_session_test.cc
@@ -2266,7 +2266,7 @@
 
   // PRIORITY_UPDATE frame arrives after stream creation.
   TestStream* stream1 = session_.CreateIncomingStream(stream_id1);
-  EXPECT_EQ(QuicStream::DefaultUrgency(),
+  EXPECT_EQ(QuicStream::kDefaultUrgency,
             stream1->precedence().spdy3_priority());
   EXPECT_CALL(debug_visitor, OnPriorityUpdateFrameReceived(priority_update1));
   session_.OnStreamFrame(data3);

quic/core/http/quic_spdy_stream.cc

diff --git a/quic/core/http/quic_spdy_stream.cc b/quic/core/http/quic_spdy_stream.cc
index c58bb03..7059fc0 100644
--- a/quic/core/http/quic_spdy_stream.cc
+++ b/quic/core/http/quic_spdy_stream.cc
@@ -200,7 +200,7 @@
       sequencer_offset_(0),
       is_decoder_processing_input_(false),
       ack_listener_(nullptr),
-      last_sent_urgency_(DefaultUrgency()) {
+      last_sent_urgency_(kDefaultUrgency) {
   DCHECK_EQ(session()->connection(), spdy_session->connection());
   DCHECK_EQ(transport_version(), spdy_session->transport_version());
   DCHECK(!QuicUtils::IsCryptoStreamId(transport_version(), id));
@@ -236,7 +236,7 @@
       sequencer_offset_(sequencer()->NumBytesConsumed()),
       is_decoder_processing_input_(false),
       ack_listener_(nullptr),
-      last_sent_urgency_(DefaultUrgency()) {
+      last_sent_urgency_(kDefaultUrgency) {
   DCHECK_EQ(session()->connection(), spdy_session->connection());
   DCHECK_EQ(transport_version(), spdy_session->transport_version());
   DCHECK(!QuicUtils::IsCryptoStreamId(transport_version(), id()));

quic/core/quic_flags_list.h

diff --git a/quic/core/quic_flags_list.h b/quic/core/quic_flags_list.h
index c80c686..0662174 100644
--- a/quic/core/quic_flags_list.h
+++ b/quic/core/quic_flags_list.h
@@ -56,7 +56,6 @@
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_fix_willing_and_able_to_write2, true)
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_give_sent_packet_to_debug_visitor_after_sent, true)
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_granular_qpack_error_codes, false)
-QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_http3_new_default_urgency_value, true)
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_key_update_supported, true)
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_let_connection_handle_pings, true)
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_process_undecryptable_packets_after_async_decrypt_callback, true)

quic/core/quic_stream.cc

diff --git a/quic/core/quic_stream.cc b/quic/core/quic_stream.cc
index 7b11146..7a177d4 100644
--- a/quic/core/quic_stream.cc
+++ b/quic/core/quic_stream.cc
@@ -108,6 +108,9 @@
 // static
 const SpdyPriority QuicStream::kDefaultPriority;
 
+// static
+const int QuicStream::kDefaultUrgency;
+
 PendingStream::PendingStream(QuicStreamId id, QuicSession* session)
     : id_(id),
       stream_delegate_(session),
@@ -388,16 +391,6 @@
   }
 }
 
-// static
-int QuicStream::DefaultUrgency() {
-  if (GetQuicReloadableFlag(quic_http3_new_default_urgency_value)) {
-    QUIC_RELOADABLE_FLAG_COUNT(quic_http3_new_default_urgency_value);
-    return 3;
-  } else {
-    return 1;
-  }
-}
-
 void QuicStream::OnStreamFrame(const QuicStreamFrame& frame) {
   DCHECK_EQ(frame.stream_id, id_);
 
@@ -1445,7 +1438,7 @@
 spdy::SpdyStreamPrecedence QuicStream::CalculateDefaultPriority(
     const QuicSession* session) {
   if (VersionUsesHttp3(session->transport_version())) {
-    return spdy::SpdyStreamPrecedence(DefaultUrgency());
+    return spdy::SpdyStreamPrecedence(kDefaultUrgency);
   }
 
   if (session->use_http2_priority_write_scheduler()) {

quic/core/quic_stream.h

diff --git a/quic/core/quic_stream.h b/quic/core/quic_stream.h
index 275e93a..50fc5e1 100644
--- a/quic/core/quic_stream.h
+++ b/quic/core/quic_stream.h
@@ -142,9 +142,7 @@
 
   // Default priority for IETF QUIC, defined by the priority extension at
   // https://httpwg.org/http-extensions/draft-ietf-httpbis-priority.html#urgency.
-  // TODO(bnc): Remove this method and reinstate static const int
-  // kDefaultUrgency member when removing quic_http3_new_default_urgency_value.
-  static int DefaultUrgency();
+  static const int kDefaultUrgency = 3;
 
   // QuicStreamSequencer::StreamInterface implementation.
   QuicStreamId id() const override { return id_; }