commit b8f83440913646db362d25591c60d2b31a39de04
author fayang <fayang@google.com> Mon Jun 01 12:09:17 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Jun 01 12:09:49 2020 -0700
tree 8ff50e1db4132fde6a108ac273565051adcb717c
parent 8b2f28cf571d448e9c3422d47487d8622b4ffccb

Deprecate gfe2_reloadable_flag_quic_break_session_stream_close_loop.

Also inline CloseStreamInner.

PiperOrigin-RevId: 314176674
Change-Id: Iad90f3607bac0204b047f1c455d824b8ddfc84b8

quic/core/quic_stream_test.cc

diff --git a/quic/core/quic_stream_test.cc b/quic/core/quic_stream_test.cc
index f30a3be..700931c 100644
--- a/quic/core/quic_stream_test.cc
+++ b/quic/core/quic_stream_test.cc
@@ -455,12 +455,8 @@
 
   // Now close the stream, and expect that we send a RST.
   EXPECT_CALL(*session_, SendRstStream(_, _, _));
-  if (session_->break_close_loop()) {
-    stream_->CloseReadSide();
-    stream_->CloseWriteSide();
-  } else {
-    stream_->OnClose();
-  }
+  stream_->CloseReadSide();
+  stream_->CloseWriteSide();
   EXPECT_FALSE(session_->HasUnackedStreamData());
   EXPECT_FALSE(fin_sent());
   EXPECT_TRUE(rst_sent());
@@ -487,12 +483,8 @@
   EXPECT_FALSE(rst_sent());
 
   // Now close the stream, and expect that we do not send a RST.
-  if (session_->break_close_loop()) {
-    stream_->CloseReadSide();
-    stream_->CloseWriteSide();
-  } else {
-    stream_->OnClose();
-  }
+  stream_->CloseReadSide();
+  stream_->CloseWriteSide();
   EXPECT_TRUE(fin_sent());
   EXPECT_FALSE(rst_sent());
 }
@@ -516,12 +508,8 @@
 
   // Now close the stream (any further resets being sent would break the
   // expectation above).
-  if (session_->break_close_loop()) {
-    stream_->CloseReadSide();
-    stream_->CloseWriteSide();
-  } else {
-    stream_->OnClose();
-  }
+  stream_->CloseReadSide();
+  stream_->CloseWriteSide();
   EXPECT_FALSE(fin_sent());
   EXPECT_TRUE(rst_sent());
 }
@@ -657,12 +645,8 @@
               CloseConnection(QUIC_FLOW_CONTROL_RECEIVED_TOO_MUCH_DATA, _, _));
   stream_->OnStreamReset(rst_frame);
   EXPECT_TRUE(stream_->HasReceivedFinalOffset());
-  if (session_->break_close_loop()) {
-    stream_->CloseReadSide();
-    stream_->CloseWriteSide();
-  } else {
-    stream_->OnClose();
-  }
+  stream_->CloseReadSide();
+  stream_->CloseWriteSide();
 }
 
 TEST_P(QuicStreamTest, FinalByteOffsetFromZeroLengthStreamFrame) {