Landing Recent QUIC changes until 4AM, Aug 7, 2016 UTC-4

net/quic/core/quic_buffered_packet_store_test.cc

Index: net/quic/core/quic_buffered_packet_store_test.cc
diff --git a/net/quic/core/quic_buffered_packet_store_test.cc b/net/quic/core/quic_buffered_packet_store_test.cc
index 3d08db4e8c546a901ec70e1c768c6f16af669137..2ea70ac7de4e2c83a0764480fbf2a8219dddc73c 100644
--- a/net/quic/core/quic_buffered_packet_store_test.cc
+++ b/net/quic/core/quic_buffered_packet_store_test.cc
@@ -9,6 +9,7 @@
 
 #include "base/stl_util.h"
 #include "net/quic/test_tools/mock_clock.h"
+#include "net/quic/test_tools/quic_buffered_packet_store_peer.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -24,13 +25,6 @@ typedef QuicBufferedPacketStore::EnqueuePacketResult EnqueuePacketResult;
 static const size_t kDefaultMaxConnectionsInStore = 100;
 
 namespace test {
-class QuicBufferedPacketStorePeer {
- public:
-  static QuicAlarm* expiration_alarm(QuicBufferedPacketStore* store) {
-    return store->expiration_alarm_.get();
-  }
-};
-
 namespace {
 
 typedef QuicBufferedPacketStore::BufferedPacket BufferedPacket;