Remove is_deletable_ from QuicStream. Add QuicStream::IsWaitingForAcks

net/quic/core/quic_stream.h

Index: net/quic/core/quic_stream.h
diff --git a/net/quic/core/quic_stream.h b/net/quic/core/quic_stream.h
index 8fd03315a6d1e52de739b5292e3ff68abd3b153c..e88c684be8c4c37837f911fe178f9eb731f1510d 100644
--- a/net/quic/core/quic_stream.h
+++ b/net/quic/core/quic_stream.h
@@ -92,6 +92,12 @@ class QUIC_EXPORT_PRIVATE QuicStream : public StreamNotifierInterface {
   virtual void CloseConnectionWithDetails(QuicErrorCode error,
                                           const std::string& details);
 
+  // Returns true if this stream is still waiting for acks of sent data.
+  // This will return false if all data has been acked, or if the stream
+  // is no longer interested in data being acked (which happens when
+  // a stream is reset because of an error).
+  bool IsWaitingForAcks() const;
+
   QuicStreamId id() const { return id_; }
 
   QuicRstStreamErrorCode stream_error() const { return stream_error_; }
@@ -126,8 +132,6 @@ class QUIC_EXPORT_PRIVATE QuicStream : public StreamNotifierInterface {
   void set_rst_received(bool rst_received) { rst_received_ = rst_received; }
   void set_stream_error(QuicRstStreamErrorCode error) { stream_error_ = error; }
 
-  bool is_deletable() const { return is_deletable_; }
-
   // Adjust the flow control window according to new offset in |frame|.
   virtual void OnWindowUpdateFrame(const QuicWindowUpdateFrame& frame);
 
@@ -192,10 +196,6 @@ class QUIC_EXPORT_PRIVATE QuicStream : public StreamNotifierInterface {
   // Adds random padding after the fin is consumed for this stream.
   void AddRandomPaddingAfterFin();
 
-  // Sets this stream as deletable. Delete this stream from zombie stream map if
-  // exists.
-  void SetIsDeletable(bool is_deletable);
-
   // StreamNotifierInterface methods:
   void OnStreamFrameAcked(const QuicStreamFrame& frame,
                           QuicTime::Delta ack_delay_time) override;
@@ -323,11 +323,6 @@ class QUIC_EXPORT_PRIVATE QuicStream : public StreamNotifierInterface {
   // True if this stream has received a RST_STREAM frame.
   bool rst_received_;
 
-  // True if this stream object may be deleted. Currently, this means this
-  // stream does not have unacked data (including FIN). Please note, this stream
-  // may not finish sending.
-  bool is_deletable_;
-
   // Tracks if the session this stream is running under was created by a
   // server or a client.
   Perspective perspective_;