Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(169)

Unified Diff: net/tools/quic/quic_spdy_server_stream_test.cc

Issue 335533002: API changes to Write path Session on down for FEC protection. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/tools/quic/end_to_end_test.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/tools/quic/quic_spdy_server_stream_test.cc
diff --git a/net/tools/quic/quic_spdy_server_stream_test.cc b/net/tools/quic/quic_spdy_server_stream_test.cc
index c4ba061443766d193a8de3fe79b1aa6bf84198b9..954f0a48e69fc0cf787d3f87e4a7059e98cc558c 100644
--- a/net/tools/quic/quic_spdy_server_stream_test.cc
+++ b/net/tools/quic/quic_spdy_server_stream_test.cc
@@ -146,6 +146,7 @@ QuicConsumedData ConsumeAllData(
const IOVector& data,
QuicStreamOffset offset,
bool fin,
+ FecProtection /*fec_protection_*/,
QuicAckNotifier::DelegateInterface* /*ack_notifier_delegate*/) {
return QuicConsumedData(data.TotalBufferSize(), fin);
}
@@ -154,7 +155,7 @@ INSTANTIATE_TEST_CASE_P(Tests, QuicSpdyServerStreamTest,
::testing::ValuesIn(QuicSupportedVersions()));
TEST_P(QuicSpdyServerStreamTest, TestFraming) {
- EXPECT_CALL(session_, WritevData(_, _, _, _, _)).Times(AnyNumber()).
+ EXPECT_CALL(session_, WritevData(_, _, _, _, _, _)).Times(AnyNumber()).
WillRepeatedly(Invoke(ConsumeAllData));
EXPECT_EQ(headers_string_.size(), stream_->ProcessData(
@@ -167,7 +168,7 @@ TEST_P(QuicSpdyServerStreamTest, TestFraming) {
}
TEST_P(QuicSpdyServerStreamTest, TestFramingOnePacket) {
- EXPECT_CALL(session_, WritevData(_, _, _, _, _)).Times(AnyNumber()).
+ EXPECT_CALL(session_, WritevData(_, _, _, _, _, _)).Times(AnyNumber()).
WillRepeatedly(Invoke(ConsumeAllData));
string message = headers_string_ + body_;
@@ -184,7 +185,7 @@ TEST_P(QuicSpdyServerStreamTest, TestFramingExtraData) {
string large_body = "hello world!!!!!!";
// We'll automatically write out an error (headers + body)
- EXPECT_CALL(session_, WritevData(_, _, _, _, _)).Times(AnyNumber()).
+ EXPECT_CALL(session_, WritevData(_, _, _, _, _, _)).Times(AnyNumber()).
WillRepeatedly(Invoke(ConsumeAllData));
EXPECT_EQ(headers_string_.size(), stream_->ProcessData(
@@ -210,10 +211,8 @@ TEST_P(QuicSpdyServerStreamTest, TestSendResponse) {
InSequence s;
EXPECT_CALL(session_,
- WritevData(kHeadersStreamId, _, 0, false, NULL));
-
-
- EXPECT_CALL(session_, WritevData(_, _, _, _, _)).Times(1).
+ WritevData(kHeadersStreamId, _, 0, false, _, NULL));
+ EXPECT_CALL(session_, WritevData(_, _, _, _, _, _)).Times(1).
WillOnce(Return(QuicConsumedData(3, true)));
QuicSpdyServerStreamPeer::SendResponse(stream_.get());
@@ -228,9 +227,8 @@ TEST_P(QuicSpdyServerStreamTest, TestSendErrorResponse) {
InSequence s;
EXPECT_CALL(session_,
- WritevData(kHeadersStreamId, _, 0, false, NULL));
-
- EXPECT_CALL(session_, WritevData(_, _, _, _, _)).Times(1).
+ WritevData(kHeadersStreamId, _, 0, false, _, NULL));
+ EXPECT_CALL(session_, WritevData(_, _, _, _, _, _)).Times(1).
WillOnce(Return(QuicConsumedData(3, true)));
QuicSpdyServerStreamPeer::SendErrorResponse(stream_.get());
« no previous file with comments | « net/tools/quic/end_to_end_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698