Use QuicSession::ResetStream instead of CloseStream() in QBONE.

QuicSession::CloseStream() will be deprecated.
PiperOrigin-RevId: 319288214
Change-Id: Ib4de13072abaaaaa60a16881f2606fbbca5a7fbf

quic/qbone/qbone_session_base.cc

diff --git a/quic/qbone/qbone_session_base.cc b/quic/qbone/qbone_session_base.cc
index 81aeda8..e534398 100644
--- a/quic/qbone/qbone_session_base.cc
+++ b/quic/qbone/qbone_session_base.cc
@@ -75,15 +75,6 @@
       CreateDataStream(GetNextOutgoingUnidirectionalStreamId()));
 }
 
-void QboneSessionBase::CloseStream(QuicStreamId stream_id) {
-  if (IsClosedStream(stream_id)) {
-    // When CloseStream has been called recursively (via
-    // QuicStream::OnClose), the stream is already closed so return.
-    return;
-  }
-  QuicSession::CloseStream(stream_id);
-}
-
 void QboneSessionBase::OnStreamFrame(const QuicStreamFrame& frame) {
   if (frame.offset == 0 && frame.fin && frame.data_length > 0) {
     ++num_ephemeral_packets_;
@@ -93,7 +84,7 @@
     // TODO(b/147817422): Add a counter for how many streams were actually
     // closed here.
     if (GetQuicFlag(FLAGS_qbone_close_ephemeral_frames)) {
-      CloseStream(frame.stream_id);
+      ResetStream(frame.stream_id, QUIC_STREAM_CANCELLED);
     }
     return;
   }

quic/qbone/qbone_session_base.h

diff --git a/quic/qbone/qbone_session_base.h b/quic/qbone/qbone_session_base.h
index 59ca2c4..4b95130 100644
--- a/quic/qbone/qbone_session_base.h
+++ b/quic/qbone/qbone_session_base.h
@@ -31,9 +31,6 @@
   // Overrides from QuicSession.
   // This will ensure that the crypto session is created.
   void Initialize() override;
-  // This will ensure that we keep track of stream ids that can be
-  // write blocked.
-  void CloseStream(QuicStreamId stream_id) override;
   // This will check if the packet is wholly contained.
   void OnStreamFrame(const QuicStreamFrame& frame) override;
   // Called whenever a MESSAGE frame is received.