Land Recent QUIC changes.

net/tools/quic/quic_epoll_connection_helper.h

Index: net/tools/quic/quic_epoll_connection_helper.h
diff --git a/net/tools/quic/quic_epoll_connection_helper.h b/net/tools/quic/quic_epoll_connection_helper.h
index edf56156fc85d0b5824e328dffc4afa98cea7e91..9ddef2f77a537123175ab6a458bc9364a7baa942 100644
--- a/net/tools/quic/quic_epoll_connection_helper.h
+++ b/net/tools/quic/quic_epoll_connection_helper.h
@@ -30,6 +30,10 @@ class RetransmissionAlarm;
 class SendAlarm;
 class TimeoutAlarm;
 
+namespace test {
+class QuicEpollConnectionHelperPeer;
+}  // namespace test
+
 class QuicEpollConnectionHelper : public QuicConnectionHelperInterface {
  public:
   QuicEpollConnectionHelper(int fd, EpollServer* eps);
@@ -56,6 +60,7 @@ class QuicEpollConnectionHelper : public QuicConnectionHelperInterface {
 
  private:
   friend class QuicConnectionPeer;
+  friend class net::tools::test::QuicEpollConnectionHelperPeer;
 
   QuicPacketWriter* writer_;  // Not owned
   EpollServer* epoll_server_;  // Not owned.