| 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 19bda41f0e408906f96c888f90687e1e4ac80e7e..1e250373d2d2a7c377884bd6f59eae28f7e3d1e3 100644
|
| --- a/net/tools/quic/quic_simple_server_stream_test.cc
|
| +++ b/net/tools/quic/quic_simple_server_stream_test.cc
|
| @@ -117,14 +117,13 @@ 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,
|
| - const scoped_refptr<QuicAckListenerInterface>&));
|
| + MOCK_METHOD6(WritevData,
|
| + QuicConsumedData(QuicStream* stream,
|
| + QuicStreamId id,
|
| + QuicIOVector data,
|
| + QuicStreamOffset offset,
|
| + bool fin,
|
| + scoped_refptr<QuicAckListenerInterface>));
|
| MOCK_METHOD4(OnStreamHeaderList,
|
| void(QuicStreamId stream_id,
|
| bool fin,
|
| @@ -134,12 +133,12 @@ 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,
|
| - const scoped_refptr<QuicAckListenerInterface>&
|
| - ack_notifier_delegate) override {
|
| + 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,
|
|
|