Landing Recent QUIC changes until Sun May 8 00:39:29 2016 +0000

net/quic/quic_connection_test.cc

Index: net/quic/quic_connection_test.cc
diff --git a/net/quic/quic_connection_test.cc b/net/quic/quic_connection_test.cc
index 78a5a2e8bcac5b9da6311049861e55e78b915d6b..937dc286a66676cedb4c7c9f6ede559a59b9f196 100644
--- a/net/quic/quic_connection_test.cc
+++ b/net/quic/quic_connection_test.cc
@@ -1057,7 +1057,7 @@ class QuicConnectionTest : public ::testing::TestWithParam<TestParams> {
   QuicPacketCreator* creator_;
   QuicPacketGenerator* generator_;
   QuicSentPacketManager* manager_;
-  StrictMock<MockConnectionVisitor> visitor_;
+  StrictMock<MockQuicConnectionVisitor> visitor_;
 
   QuicStreamFrame frame1_;
   QuicStreamFrame frame2_;
@@ -1910,7 +1910,7 @@ TEST_P(QuicConnectionTest, FramePackingSendv) {
   EXPECT_EQ(1u, writer_->stream_frames().size());
   QuicStreamFrame* frame = writer_->stream_frames()[0];
   EXPECT_EQ(1u, frame->stream_id);
-  EXPECT_EQ("ABCD", StringPiece(frame->frame_buffer, frame->frame_length));
+  EXPECT_EQ("ABCD", StringPiece(frame->data_buffer, frame->data_length));
 }
 
 TEST_P(QuicConnectionTest, FramePackingSendvQueued) {