commit b3161f2e5fe5dabc45fb9aa93a7e35b851bc6b51
author fayang <fayang@google.com> Tue Feb 18 11:00:04 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Feb 18 11:00:44 2020 -0800
tree 6b7233f842e128655d58b89086347d6769528e71
parent 2f5f30b5b510fa4dbf3164f7409e0f27d5ed708c

gfe-relnote: Deprecate gfe2_reloadable_flag_quic_enable_rr_write_scheduler.

PiperOrigin-RevId: 295773569
Change-Id: I6de7fec91b1365e09c1abfd7873b9582438cf3eb

quic/core/quic_session.cc

diff --git a/quic/core/quic_session.cc b/quic/core/quic_session.cc
index 108060b..e10ccb6 100644
--- a/quic/core/quic_session.cc
+++ b/quic/core/quic_session.cc
@@ -1083,11 +1083,9 @@
         // Enable LIFO write scheduler.
         write_blocked_streams_.SwitchWriteScheduler(
             spdy::WriteSchedulerType::LIFO, transport_version());
-      } else if (GetQuicReloadableFlag(quic_enable_rr_write_scheduler) &&
-                 ContainsQuicTag(config_.ReceivedConnectionOptions(), kRRWS) &&
+      } else if (ContainsQuicTag(config_.ReceivedConnectionOptions(), kRRWS) &&
                  write_blocked_streams_.scheduler_type() ==
                      spdy::WriteSchedulerType::SPDY) {
-        QUIC_RELOADABLE_FLAG_COUNT(quic_enable_rr_write_scheduler);
         enable_round_robin_scheduling_ = true;
       }
     }

quic/core/quic_session_test.cc

diff --git a/quic/core/quic_session_test.cc b/quic/core/quic_session_test.cc
index 0679dcc..8582b1b 100644
--- a/quic/core/quic_session_test.cc
+++ b/quic/core/quic_session_test.cc
@@ -1053,7 +1053,6 @@
     // IETF QUIC currently doesn't support PRIORITY.
     return;
   }
-  SetQuicReloadableFlag(quic_enable_rr_write_scheduler, true);
   QuicTagVector copt;
   copt.push_back(kRRWS);
   QuicConfigPeer::SetReceivedConnectionOptions(session_.config(), copt);