Land Recent QUIC Changes.

net/tools/quic/quic_server_session_test.cc

Index: net/tools/quic/quic_server_session_test.cc
diff --git a/net/tools/quic/quic_server_session_test.cc b/net/tools/quic/quic_server_session_test.cc
index 8690886f0d7cf44b13901e3d5ef2c53fa3a86d33..507ac8dab3218ab15d23ef22fe0982998f323f7f 100644
--- a/net/tools/quic/quic_server_session_test.cc
+++ b/net/tools/quic/quic_server_session_test.cc
@@ -85,7 +85,7 @@ TEST_P(QuicServerSessionTest, CloseStreamDueToReset) {
   QuicRstStreamFrame rst1(stream_id, QUIC_STREAM_NO_ERROR, 0);
   if (version() > QUIC_VERSION_13) {
     EXPECT_CALL(*connection_,
-                SendRstStream(stream_id, QUIC_STREAM_NO_ERROR, 0));
+                SendRstStream(stream_id, QUIC_RST_FLOW_CONTROL_ACCOUNTING, 0));
   }
   visitor_->OnRstStream(rst1);
   EXPECT_EQ(0u, session_->GetNumOpenStreams());
@@ -104,7 +104,7 @@ TEST_P(QuicServerSessionTest, NeverOpenStreamDueToReset) {
   QuicRstStreamFrame rst1(stream_id, QUIC_STREAM_NO_ERROR, 0);
   if (version() > QUIC_VERSION_13) {
     EXPECT_CALL(*connection_,
-                SendRstStream(stream_id, QUIC_STREAM_NO_ERROR, 0));
+                SendRstStream(stream_id, QUIC_RST_FLOW_CONTROL_ACCOUNTING, 0));
   }
   visitor_->OnRstStream(rst1);
   EXPECT_EQ(0u, session_->GetNumOpenStreams());
@@ -134,7 +134,7 @@ TEST_P(QuicServerSessionTest, AcceptClosedStream) {
   QuicRstStreamFrame rst(stream_id, QUIC_STREAM_NO_ERROR, 0);
   if (version() > QUIC_VERSION_13) {
     EXPECT_CALL(*connection_,
-                SendRstStream(stream_id, QUIC_STREAM_NO_ERROR, 0));
+                SendRstStream(stream_id, QUIC_RST_FLOW_CONTROL_ACCOUNTING, 0));
   }
   visitor_->OnRstStream(rst);