Landing Recent QUIC changes until 9:41 AM, Oct 10, 2016 UTC-7

net/tools/quic/quic_time_wait_list_manager_test.cc

Index: net/tools/quic/quic_time_wait_list_manager_test.cc
diff --git a/net/tools/quic/quic_time_wait_list_manager_test.cc b/net/tools/quic/quic_time_wait_list_manager_test.cc
index 54b5ea809d4891fe595e7367d943e30b59d81f82..e77978e867230742ff70f3ec64508956e7bfb334 100644
--- a/net/tools/quic/quic_time_wait_list_manager_test.cc
+++ b/net/tools/quic/quic_time_wait_list_manager_test.cc
@@ -18,6 +18,7 @@
 #include "net/quic/core/quic_protocol.h"
 #include "net/quic/core/quic_utils.h"
 #include "net/quic/test_tools/quic_test_utils.h"
+#include "net/quic/test_tools/quic_time_wait_list_manager_peer.h"
 #include "net/tools/quic/quic_epoll_alarm_factory.h"
 #include "net/tools/quic/quic_epoll_connection_helper.h"
 #include "net/tools/quic/test_tools/mock_epoll_server.h"
@@ -65,24 +66,6 @@ class FramerVisitorCapturingPublicReset : public NoOpFramerVisitor {
   QuicPublicResetPacket public_reset_packet_;
 };
 
-class QuicTimeWaitListManagerPeer {
- public:
-  static bool ShouldSendResponse(QuicTimeWaitListManager* manager,
-                                 int received_packet_count) {
-    return manager->ShouldSendResponse(received_packet_count);
-  }
-
-  static QuicTime::Delta time_wait_period(QuicTimeWaitListManager* manager) {
-    return manager->time_wait_period_;
-  }
-
-  static QuicVersion GetQuicVersionFromConnectionId(
-      QuicTimeWaitListManager* manager,
-      QuicConnectionId connection_id) {
-    return manager->GetQuicVersionFromConnectionId(connection_id);
-  }
-};
-
 namespace {
 
 class MockFakeTimeEpollServer : public FakeTimeEpollServer {