Index: net/quic/quic_chromium_client_stream_test.cc |
diff --git a/net/quic/quic_chromium_client_stream_test.cc b/net/quic/quic_chromium_client_stream_test.cc |
index f384304002dec9dadbd690ddf45fa22ba522dd1d..19c427cf446b030c12d31c7a40aa83572963b039 100644 |
--- a/net/quic/quic_chromium_client_stream_test.cc |
+++ b/net/quic/quic_chromium_client_stream_test.cc |
@@ -60,12 +60,11 @@ class MockQuicClientSessionBase : public QuicClientSessionBase { |
MOCK_METHOD1(CreateIncomingDynamicStream, QuicSpdyStream*(QuicStreamId id)); |
MOCK_METHOD1(CreateOutgoingDynamicStream, |
QuicChromiumClientStream*(SpdyPriority priority)); |
- MOCK_METHOD6(WritevData, |
+ MOCK_METHOD5(WritevData, |
QuicConsumedData(QuicStreamId id, |
QuicIOVector data, |
QuicStreamOffset offset, |
bool fin, |
- FecProtection fec_protection, |
QuicAckListenerInterface*)); |
MOCK_METHOD3(SendRstStream, |
void(QuicStreamId stream_id, |
@@ -102,7 +101,6 @@ class MockQuicClientSessionBase : public QuicClientSessionBase { |
const QuicIOVector& data, |
QuicStreamOffset offset, |
bool fin, |
- FecProtection fec_protection, |
QuicAckListenerInterface* ack_notifier_delegate); |
void OnProofValid( |
@@ -125,7 +123,7 @@ MockQuicClientSessionBase::MockQuicClientSessionBase( |
DefaultQuicConfig()) { |
crypto_stream_.reset(new QuicCryptoStream(this)); |
Initialize(); |
- ON_CALL(*this, WritevData(_, _, _, _, _, _)) |
+ ON_CALL(*this, WritevData(_, _, _, _, _)) |
.WillByDefault(testing::Return(QuicConsumedData(0, false))); |
} |
@@ -335,7 +333,7 @@ TEST_P(QuicChromiumClientStreamTest, WriteStreamData) { |
const size_t kDataLen = arraysize(kData1); |
// All data written. |
- EXPECT_CALL(session_, WritevData(stream_->id(), _, _, _, _, _)) |
+ EXPECT_CALL(session_, WritevData(stream_->id(), _, _, _, _)) |
.WillOnce(Return(QuicConsumedData(kDataLen, true))); |
TestCompletionCallback callback; |
EXPECT_EQ(OK, stream_->WriteStreamData(base::StringPiece(kData1, kDataLen), |
@@ -350,7 +348,7 @@ TEST_P(QuicChromiumClientStreamTest, WriteStreamDataAsync) { |
const size_t kDataLen = arraysize(kData1); |
// No data written. |
- EXPECT_CALL(session_, WritevData(stream_->id(), _, _, _, _, _)) |
+ EXPECT_CALL(session_, WritevData(stream_->id(), _, _, _, _)) |
.WillOnce(Return(QuicConsumedData(0, false))); |
TestCompletionCallback callback; |
EXPECT_EQ(ERR_IO_PENDING, |
@@ -359,7 +357,7 @@ TEST_P(QuicChromiumClientStreamTest, WriteStreamDataAsync) { |
ASSERT_FALSE(callback.have_result()); |
// All data written. |
- EXPECT_CALL(session_, WritevData(stream_->id(), _, _, _, _, _)) |
+ EXPECT_CALL(session_, WritevData(stream_->id(), _, _, _, _)) |
.WillOnce(Return(QuicConsumedData(kDataLen, true))); |
stream_->OnCanWrite(); |
ASSERT_TRUE(callback.have_result()); |