Land Recent QUIC Changes

net/quic/reliable_quic_stream_test.cc

Index: net/quic/reliable_quic_stream_test.cc
diff --git a/net/quic/reliable_quic_stream_test.cc b/net/quic/reliable_quic_stream_test.cc
index c941e44f4603a3218cf9021b3f7ab5e626a4728a..0c2079c9159e5c446b7ac788322e86442bb289e0 100644
--- a/net/quic/reliable_quic_stream_test.cc
+++ b/net/quic/reliable_quic_stream_test.cc
@@ -32,6 +32,8 @@ class QuicReliableTestStream : public ReliableQuicStream {
     return 0;
   }
   using ReliableQuicStream::WriteData;
+  using ReliableQuicStream::CloseReadSide;
+  using ReliableQuicStream::CloseWriteSide;
 };
 
 class ReliableQuicStreamTest : public ::testing::TestWithParam<bool> {
@@ -87,6 +89,16 @@ TEST_F(ReliableQuicStreamTest, WriteData) {
   stream_.OnCanWrite();
 }
 
+TEST_F(ReliableQuicStreamTest, ConnectionCloseAfterStreamClose) {
+  stream_.CloseReadSide();
+  stream_.CloseWriteSide();
+  EXPECT_EQ(QUIC_STREAM_NO_ERROR, stream_.stream_error());
+  EXPECT_EQ(QUIC_NO_ERROR, stream_.connection_error());
+  stream_.ConnectionClose(QUIC_INTERNAL_ERROR, false);
+  EXPECT_EQ(QUIC_STREAM_NO_ERROR, stream_.stream_error());
+  EXPECT_EQ(QUIC_NO_ERROR, stream_.connection_error());
+}
+
 }  // namespace
 }  // namespace test
 }  // namespace net