| Index: net/quic/quic_connection_test.cc
|
| diff --git a/net/quic/quic_connection_test.cc b/net/quic/quic_connection_test.cc
|
| index 327d057c1acb72d35dbf6b406dc03d3dc77a323c..cf6ae8ca9304f62a54af974f6ac48d77d0a6a4bc 100644
|
| --- a/net/quic/quic_connection_test.cc
|
| +++ b/net/quic/quic_connection_test.cc
|
| @@ -817,7 +817,7 @@ class QuicConnectionTest : public ::testing::TestWithParam<QuicVersion> {
|
| QuicFrame frame(&frame1_);
|
| frames.push_back(frame);
|
| QuicPacket* packet =
|
| - framer_.BuildUnsizedDataPacket(header_, frames).packet;
|
| + BuildUnsizedDataPacket(&framer_, header_, frames).packet;
|
| EXPECT_TRUE(packet != NULL);
|
| return packet;
|
| }
|
| @@ -840,7 +840,7 @@ class QuicConnectionTest : public ::testing::TestWithParam<QuicVersion> {
|
| QuicFrame frame(&qccf);
|
| frames.push_back(frame);
|
| QuicPacket* packet =
|
| - framer_.BuildUnsizedDataPacket(header_, frames).packet;
|
| + BuildUnsizedDataPacket(&framer_, header_, frames).packet;
|
| EXPECT_TRUE(packet != NULL);
|
| return packet;
|
| }
|
| @@ -3334,7 +3334,7 @@ TEST_P(QuicConnectionTest, ServerSendsVersionNegotiationPacket) {
|
| QuicFrame frame(&frame1_);
|
| frames.push_back(frame);
|
| scoped_ptr<QuicPacket> packet(
|
| - framer_.BuildUnsizedDataPacket(header, frames).packet);
|
| + BuildUnsizedDataPacket(&framer_, header, frames).packet);
|
| scoped_ptr<QuicEncryptedPacket> encrypted(
|
| framer_.EncryptPacket(ENCRYPTION_NONE, 12, *packet));
|
|
|
| @@ -3372,7 +3372,7 @@ TEST_P(QuicConnectionTest, ServerSendsVersionNegotiationPacketSocketBlocked) {
|
| QuicFrame frame(&frame1_);
|
| frames.push_back(frame);
|
| scoped_ptr<QuicPacket> packet(
|
| - framer_.BuildUnsizedDataPacket(header, frames).packet);
|
| + BuildUnsizedDataPacket(&framer_, header, frames).packet);
|
| scoped_ptr<QuicEncryptedPacket> encrypted(
|
| framer_.EncryptPacket(ENCRYPTION_NONE, 12, *packet));
|
|
|
| @@ -3417,7 +3417,7 @@ TEST_P(QuicConnectionTest,
|
| QuicFrame frame(&frame1_);
|
| frames.push_back(frame);
|
| scoped_ptr<QuicPacket> packet(
|
| - framer_.BuildUnsizedDataPacket(header, frames).packet);
|
| + BuildUnsizedDataPacket(&framer_, header, frames).packet);
|
| scoped_ptr<QuicEncryptedPacket> encrypted(
|
| framer_.EncryptPacket(ENCRYPTION_NONE, 12, *packet));
|
|
|
| @@ -3462,7 +3462,7 @@ TEST_P(QuicConnectionTest, ClientHandlesVersionNegotiation) {
|
| QuicFrame frame(&frame1_);
|
| frames.push_back(frame);
|
| scoped_ptr<QuicPacket> packet(
|
| - framer_.BuildUnsizedDataPacket(header, frames).packet);
|
| + BuildUnsizedDataPacket(&framer_, header, frames).packet);
|
| encrypted.reset(framer_.EncryptPacket(ENCRYPTION_NONE, 12, *packet));
|
| EXPECT_CALL(visitor_, OnStreamFrames(_)).Times(1);
|
| EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_));
|
| @@ -3607,7 +3607,7 @@ TEST_P(QuicConnectionTest, ProcessFramesIfPacketClosedConnection) {
|
| frames.push_back(stream_frame);
|
| frames.push_back(close_frame);
|
| scoped_ptr<QuicPacket> packet(
|
| - framer_.BuildUnsizedDataPacket(header_, frames).packet);
|
| + BuildUnsizedDataPacket(&framer_, header_, frames).packet);
|
| EXPECT_TRUE(NULL != packet.get());
|
| scoped_ptr<QuicEncryptedPacket> encrypted(framer_.EncryptPacket(
|
| ENCRYPTION_NONE, 1, *packet));
|
| @@ -3897,7 +3897,7 @@ TEST_P(QuicConnectionTest, AckNotifierCallbackAfterFECRecovery) {
|
| ack_header.fec_group = 1;
|
|
|
| QuicPacket* packet =
|
| - framer_.BuildUnsizedDataPacket(ack_header, frames).packet;
|
| + BuildUnsizedDataPacket(&framer_, ack_header, frames).packet;
|
|
|
| // Take the packet which contains the ACK frame, and construct and deliver an
|
| // FEC packet which allows the ACK packet to be recovered.
|
|
|