Land Recent QUIC changes.

net/tools/quic/quic_epoll_connection_helper_test.cc

Index: net/tools/quic/quic_epoll_connection_helper_test.cc
diff --git a/net/tools/quic/quic_epoll_connection_helper_test.cc b/net/tools/quic/quic_epoll_connection_helper_test.cc
index a61813c9e4f4110473f66b7877c9057a377d3fd3..c78d86bdb6c6c19181b5d9a48c92e9487d93b971 100644
--- a/net/tools/quic/quic_epoll_connection_helper_test.cc
+++ b/net/tools/quic/quic_epoll_connection_helper_test.cc
@@ -30,7 +30,7 @@ namespace tools {
 namespace test {
 namespace {
 
-const char data1[] = "foo";
+const char kData[] = "foo";
 const bool kFromPeer = true;
 
 class TestConnectionHelper : public QuicEpollConnectionHelper {
@@ -81,7 +81,7 @@ class QuicEpollConnectionHelperTest : public ::testing::Test {
         send_algorithm_(new testing::StrictMock<MockSendAlgorithm>),
         helper_(new TestConnectionHelper(0, &epoll_server_)),
         connection_(guid_, IPEndPoint(), helper_),
-        frame1_(3, false, 0, data1) {
+        frame_(3, false, 0, kData) {
     connection_.set_visitor(&visitor_);
     connection_.SetSendAlgorithm(send_algorithm_);
     epoll_server_.set_timeout_in_us(-1);
@@ -106,8 +106,7 @@ class QuicEpollConnectionHelperTest : public ::testing::Test {
     header_.fec_group = fec_group;
 
     QuicFrames frames;
-    QuicFrame frame(&frame1_);
-    frames.push_back(frame);
+    frames.push_back(QuicFrame(&frame_));
     return framer_.BuildUnsizedDataPacket(header_, frames).packet;
   }
 
@@ -121,7 +120,7 @@ class QuicEpollConnectionHelperTest : public ::testing::Test {
   testing::StrictMock<MockConnectionVisitor> visitor_;
 
   QuicPacketHeader header_;
-  QuicStreamFrame frame1_;
+  QuicStreamFrame frame_;
 };
 
 TEST_F(QuicEpollConnectionHelperTest, DISABLED_TestRTORetransmission) {