Index: net/tools/quic/quic_simple_server_stream_test.cc |
diff --git a/net/tools/quic/quic_simple_server_stream_test.cc b/net/tools/quic/quic_simple_server_stream_test.cc |
index 1e250373d2d2a7c377884bd6f59eae28f7e3d1e3..14210b7382567c2d8cd956c2d8d9cc6d796d0bf1 100644 |
--- a/net/tools/quic/quic_simple_server_stream_test.cc |
+++ b/net/tools/quic/quic_simple_server_stream_test.cc |
@@ -117,13 +117,14 @@ class MockQuicSimpleServerSession : public QuicSimpleServerSession { |
const string& error_details, |
ConnectionCloseSource source)); |
MOCK_METHOD1(CreateIncomingDynamicStream, QuicSpdyStream*(QuicStreamId id)); |
- MOCK_METHOD6(WritevData, |
- QuicConsumedData(QuicStream* stream, |
- QuicStreamId id, |
- QuicIOVector data, |
- QuicStreamOffset offset, |
- bool fin, |
- scoped_refptr<QuicAckListenerInterface>)); |
+ MOCK_METHOD6( |
+ WritevData, |
+ QuicConsumedData(QuicStream* stream, |
+ QuicStreamId id, |
+ QuicIOVector data, |
+ QuicStreamOffset offset, |
+ bool fin, |
+ QuicReferenceCountedPointer<QuicAckListenerInterface>)); |
MOCK_METHOD4(OnStreamHeaderList, |
void(QuicStreamId stream_id, |
bool fin, |
@@ -133,21 +134,22 @@ class MockQuicSimpleServerSession : public QuicSimpleServerSession { |
void(QuicStreamId stream_id, SpdyPriority priority)); |
// Methods taking non-copyable types like SpdyHeaderBlock by value cannot be |
// mocked directly. |
- size_t WriteHeaders( |
- QuicStreamId id, |
- SpdyHeaderBlock headers, |
- bool fin, |
- SpdyPriority priority, |
- scoped_refptr<QuicAckListenerInterface> ack_notifier_delegate) override { |
- return WriteHeadersMock(id, headers, fin, priority, ack_notifier_delegate); |
- } |
- MOCK_METHOD5(WriteHeadersMock, |
- size_t(QuicStreamId id, |
- const SpdyHeaderBlock& headers, |
+ size_t WriteHeaders(QuicStreamId id, |
+ SpdyHeaderBlock headers, |
bool fin, |
SpdyPriority priority, |
- const scoped_refptr<QuicAckListenerInterface>& |
- ack_notifier_delegate)); |
+ QuicReferenceCountedPointer<QuicAckListenerInterface> |
+ ack_notifier_delegate) override { |
+ return WriteHeadersMock(id, headers, fin, priority, ack_notifier_delegate); |
+ } |
+ MOCK_METHOD5( |
+ WriteHeadersMock, |
+ size_t(QuicStreamId id, |
+ const SpdyHeaderBlock& headers, |
+ bool fin, |
+ SpdyPriority priority, |
+ const QuicReferenceCountedPointer<QuicAckListenerInterface>& |
+ ack_notifier_delegate)); |
MOCK_METHOD3(SendRstStream, |
void(QuicStreamId stream_id, |
QuicRstStreamErrorCode error, |