Remove is_deletable_ from QuicStream. Add QuicStream::IsWaitingForAcks

net/quic/core/quic_session_test.cc

Index: net/quic/core/quic_session_test.cc
diff --git a/net/quic/core/quic_session_test.cc b/net/quic/core/quic_session_test.cc
index 6df385124f464e504fca021871faae42a3e7b0df..8a251a7d03d3541bdf85ce2c4dfd63c50020785f 100644
--- a/net/quic/core/quic_session_test.cc
+++ b/net/quic/core/quic_session_test.cc
@@ -93,7 +93,6 @@ class TestStream : public QuicSpdyStream {
       : QuicSpdyStream(id, session) {}
 
   using QuicStream::CloseWriteSide;
-  using QuicStream::SetIsDeletable;
 
   void OnDataAvailable() override {}
 
@@ -1354,14 +1353,15 @@ TEST_P(QuicSessionTestServer, ZombieStreams) {
     return;
   }
   TestStream* stream2 = session_.CreateOutgoingDynamicStream(kDefaultPriority);
-  stream2->SetIsDeletable(false);
+  QuicStreamPeer::SetStreamBytesWritten(3, stream2);
+  EXPECT_TRUE(stream2->IsWaitingForAcks());
 
   EXPECT_CALL(*connection_, SendRstStream(2, _, _));
   session_.CloseStream(2);
-  EXPECT_TRUE(ContainsKey(session_.zombie_streams(), 2));
+  EXPECT_TRUE(QuicContainsKey(session_.zombie_streams(), 2));
   EXPECT_TRUE(session_.closed_streams()->empty());
-  stream2->SetIsDeletable(true);
-  EXPECT_FALSE(ContainsKey(session_.zombie_streams(), 2));
+  session_.OnStreamDoneWaitingForAcks(2);
+  EXPECT_FALSE(QuicContainsKey(session_.zombie_streams(), 2));
   EXPECT_EQ(1u, session_.closed_streams()->size());
   EXPECT_EQ(2u, session_.closed_streams()->front()->id());
 }