commit 1278630938def3e3dec09bd168076619f54bfda7
author bnc <bnc@google.com> Mon Nov 23 10:50:15 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Nov 23 10:51:04 2020 -0800
tree f312164cd162cd85d5c44f8e685c3308874409c0
parent 17369d2a4a6a4b74f53823dba9d47ea3a00e6e17

Deprecate gfe2_reloadable_flag_quic_fix_http3_goaway_stream_id.

PiperOrigin-RevId: 343882708
Change-Id: Ieebe29a16ff75f774540d0fd82788035a59091e7

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 6d93b44..d1e271c 100644
--- a/quic/core/http/quic_spdy_session_test.cc
+++ b/quic/core/http/quic_spdy_session_test.cc
@@ -1130,14 +1130,6 @@
 
   // No more GOAWAY frames are sent because they could not convey new
   // information to the client.
-  if (!GetQuicReloadableFlag(quic_fix_http3_goaway_stream_id) &&
-      !GetQuicReloadableFlag(quic_goaway_with_max_stream_id)) {
-    // Except when both these flags are false, in which case a second GOAWAY
-    // frame is sent.
-    EXPECT_CALL(*writer_, WritePacket(_, _, _, _, _))
-        .WillOnce(Return(WriteResult(WRITE_STATUS_OK, 0)));
-    EXPECT_CALL(debug_visitor, OnGoAwayFrameSent(/* stream_id = */ 0));
-  }
   session_.SendHttp3GoAway();
 }
 
@@ -1146,10 +1138,6 @@
     return;
   }
 
-  if (!GetQuicReloadableFlag(quic_fix_http3_goaway_stream_id)) {
-    return;
-  }
-
   CompleteHandshake();
   StrictMock<MockHttp3DebugVisitor> debug_visitor;
   session_.set_debug_visitor(&debug_visitor);
@@ -3160,16 +3148,11 @@
                            &session_, /*unidirectional = */ false));
 
   if (GetQuicReloadableFlag(quic_send_goaway_with_connection_close)) {
-    if (GetQuicReloadableFlag(quic_fix_http3_goaway_stream_id)) {
-      // Stream with stream_id is already received and potentially processed,
-      // therefore a GOAWAY frame is sent with the next stream ID.
-      EXPECT_CALL(debug_visitor,
-                  OnGoAwayFrameSent(stream_id + QuicUtils::StreamIdDelta(
-                                                    transport_version())));
-    } else {
-      // GOAWAY frame stream id is incorrect, ignore.
-      EXPECT_CALL(debug_visitor, OnGoAwayFrameSent(_));
-    }
+    // Stream with stream_id is already received and potentially processed,
+    // therefore a GOAWAY frame is sent with the next stream ID.
+    EXPECT_CALL(debug_visitor,
+                OnGoAwayFrameSent(
+                    stream_id + QuicUtils::StreamIdDelta(transport_version())));
   }
 
   // Close connection.