| Index: net/quic/core/quic_stream.h
|
| diff --git a/net/quic/core/quic_stream.h b/net/quic/core/quic_stream.h
|
| index 2ee785eef2f6ae39076a6c594bf32df146a3f72a..4220ba5be40b8fd2178e0f87fd5834e56cb42ad6 100644
|
| --- a/net/quic/core/quic_stream.h
|
| +++ b/net/quic/core/quic_stream.h
|
| @@ -25,7 +25,6 @@
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/ref_counted.h"
|
| #include "base/strings/string_piece.h"
|
| #include "net/base/iovec.h"
|
| #include "net/quic/core/quic_flow_controller.h"
|
| @@ -34,6 +33,7 @@
|
| #include "net/quic/core/quic_stream_sequencer.h"
|
| #include "net/quic/core/quic_types.h"
|
| #include "net/quic/platform/api/quic_export.h"
|
| +#include "net/quic/platform/api/quic_reference_counted.h"
|
|
|
| namespace net {
|
|
|
| @@ -184,9 +184,10 @@ class QUIC_EXPORT_PRIVATE QuicStream {
|
| // and then buffers any remaining data in queued_data_.
|
| // If fin is true: if it is immediately passed on to the session,
|
| // write_side_closed() becomes true, otherwise fin_buffered_ becomes true.
|
| - void WriteOrBufferData(base::StringPiece data,
|
| - bool fin,
|
| - scoped_refptr<QuicAckListenerInterface> ack_listener);
|
| + void WriteOrBufferData(
|
| + base::StringPiece data,
|
| + bool fin,
|
| + QuicReferenceCountedPointer<QuicAckListenerInterface> ack_listener);
|
|
|
| // Sends as many bytes in the first |count| buffers of |iov| to the connection
|
| // as the connection will consume.
|
| @@ -197,7 +198,7 @@ class QUIC_EXPORT_PRIVATE QuicStream {
|
| const struct iovec* iov,
|
| int iov_count,
|
| bool fin,
|
| - scoped_refptr<QuicAckListenerInterface> ack_listener);
|
| + QuicReferenceCountedPointer<QuicAckListenerInterface> ack_listener);
|
|
|
| // Allows override of the session level writev, for the force HOL
|
| // blocking experiment.
|
| @@ -205,7 +206,8 @@ class QUIC_EXPORT_PRIVATE QuicStream {
|
| QuicIOVector iov,
|
| QuicStreamOffset offset,
|
| bool fin,
|
| - scoped_refptr<QuicAckListenerInterface> ack_notifier_delegate);
|
| + QuicReferenceCountedPointer<QuicAckListenerInterface>
|
| + ack_notifier_delegate);
|
|
|
| // Close the write side of the socket. Further writes will fail.
|
| // Can be called by the subclass or internally.
|
| @@ -236,8 +238,9 @@ class QUIC_EXPORT_PRIVATE QuicStream {
|
| bool read_side_closed() const { return read_side_closed_; }
|
|
|
| struct PendingData {
|
| - PendingData(std::string data_in,
|
| - scoped_refptr<QuicAckListenerInterface> ack_listener_in);
|
| + PendingData(
|
| + std::string data_in,
|
| + QuicReferenceCountedPointer<QuicAckListenerInterface> ack_listener_in);
|
| ~PendingData();
|
|
|
| // Pending data to be written.
|
| @@ -246,7 +249,7 @@ class QUIC_EXPORT_PRIVATE QuicStream {
|
| size_t offset;
|
| // AckListener that should be notified when the pending data is acked.
|
| // Can be nullptr.
|
| - scoped_refptr<QuicAckListenerInterface> ack_listener;
|
| + QuicReferenceCountedPointer<QuicAckListenerInterface> ack_listener;
|
| };
|
|
|
| // Calls MaybeSendBlocked on the stream's flow controller and the connection
|
|
|