Remove is_deletable_ from QuicStream. Add QuicStream::IsWaitingForAcks

net/quic/core/quic_session_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/core/quic_session.h"
 
 #include <cstdint>
 #include <set>
 #include <utility>
 
@@ skipping 75 matching lines @@
 
   MOCK_METHOD0(OnCanWrite, void());
 };
 
 class TestStream : public QuicSpdyStream {
  public:
   TestStream(QuicStreamId id, QuicSpdySession* session)
       : QuicSpdyStream(id, session) {}
 
   using QuicStream::CloseWriteSide;
-  using QuicStream::SetIsDeletable;
 
   void OnDataAvailable() override {}
 
   MOCK_METHOD0(OnCanWrite, void());
 };
 
 // Poor man's functor for use as callback in a mock.
 class StreamBlocker {
  public:
   StreamBlocker(QuicSession* session, QuicStreamId stream_id)
@@ skipping 1240 matching lines @@
   } else {
     EXPECT_TRUE(session_.force_hol_blocking());
   }
 }
 
 TEST_P(QuicSessionTestServer, ZombieStreams) {
   if (!session_.use_stream_notifier()) {
     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());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net