| Index: net/quic/test_tools/quic_test_utils.h
|
| diff --git a/net/quic/test_tools/quic_test_utils.h b/net/quic/test_tools/quic_test_utils.h
|
| index 617a686b5fb93473dbf7e79c6884952897be16ed..fa773b723f9ca2cb68d61027c84d45d57c6f2c48 100644
|
| --- a/net/quic/test_tools/quic_test_utils.h
|
| +++ b/net/quic/test_tools/quic_test_utils.h
|
| @@ -512,13 +512,14 @@ class MockQuicSession : public QuicSession {
|
| MOCK_METHOD1(CreateOutgoingDynamicStream, QuicStream*(SpdyPriority priority));
|
| MOCK_METHOD1(ShouldCreateIncomingDynamicStream, bool(QuicStreamId id));
|
| MOCK_METHOD0(ShouldCreateOutgoingDynamicStream, bool());
|
| - MOCK_METHOD6(WritevData,
|
| - QuicConsumedData(QuicStream* stream,
|
| - QuicStreamId id,
|
| - QuicIOVector data,
|
| - QuicStreamOffset offset,
|
| - bool fin,
|
| - QuicAckListenerInterface*));
|
| + MOCK_METHOD6(
|
| + WritevData,
|
| + QuicConsumedData(QuicStream* stream,
|
| + QuicStreamId id,
|
| + QuicIOVector data,
|
| + QuicStreamOffset offset,
|
| + bool fin,
|
| + const scoped_refptr<QuicAckListenerInterface>&));
|
|
|
| MOCK_METHOD3(SendRstStream,
|
| void(QuicStreamId stream_id,
|
| @@ -543,7 +544,7 @@ class MockQuicSession : public QuicSession {
|
| const QuicIOVector& data,
|
| QuicStreamOffset offset,
|
| bool fin,
|
| - QuicAckListenerInterface* ack_notifier_delegate);
|
| + const scoped_refptr<QuicAckListenerInterface>& ack_notifier_delegate);
|
|
|
| private:
|
| std::unique_ptr<QuicCryptoStream> crypto_stream_;
|
| @@ -576,7 +577,8 @@ class MockQuicSpdySession : public QuicSpdySession {
|
| QuicIOVector data,
|
| QuicStreamOffset offset,
|
| bool fin,
|
| - QuicAckListenerInterface*));
|
| + const scoped_refptr<QuicAckListenerInterface>&
|
| + ack_listener));
|
|
|
| MOCK_METHOD3(SendRstStream,
|
| void(QuicStreamId stream_id,
|
| @@ -608,12 +610,12 @@ class MockQuicSpdySession : public QuicSpdySession {
|
| const QuicHeaderList& header_list));
|
| // Methods taking non-copyable types like SpdyHeaderBlock by value cannot be
|
| // mocked directly.
|
| - size_t WriteHeaders(
|
| - QuicStreamId id,
|
| - SpdyHeaderBlock headers,
|
| - bool fin,
|
| - SpdyPriority priority,
|
| - QuicAckListenerInterface* ack_notifier_delegate) override {
|
| + size_t WriteHeaders(QuicStreamId id,
|
| + SpdyHeaderBlock headers,
|
| + bool fin,
|
| + SpdyPriority priority,
|
| + const scoped_refptr<QuicAckListenerInterface>&
|
| + ack_notifier_delegate) override {
|
| write_headers_ = std::move(headers);
|
| return WriteHeadersMock(id, write_headers_, fin, priority,
|
| ack_notifier_delegate);
|
| @@ -623,7 +625,8 @@ class MockQuicSpdySession : public QuicSpdySession {
|
| const SpdyHeaderBlock& headers,
|
| bool fin,
|
| SpdyPriority priority,
|
| - QuicAckListenerInterface* ack_notifier_delegate));
|
| + const scoped_refptr<QuicAckListenerInterface>&
|
| + ack_notifier_delegate));
|
| MOCK_METHOD1(OnHeadersHeadOfLineBlocking, void(QuicTime::Delta delta));
|
| MOCK_METHOD4(
|
| OnStreamFrameData,
|
|
|