Landing Recent QUIC changes until 4/15/2016 17:20 UTC

net/tools/quic/test_tools/quic_dispatcher_peer.cc

Index: net/tools/quic/test_tools/quic_dispatcher_peer.cc
diff --git a/net/tools/quic/test_tools/quic_dispatcher_peer.cc b/net/tools/quic/test_tools/quic_dispatcher_peer.cc
index 232043fbc5c466404855bfa17b47d85dd5bcf6c5..48a61f71d688555f9a3e6ce86aa1016dcca1d4c8 100644
--- a/net/tools/quic/test_tools/quic_dispatcher_peer.cc
+++ b/net/tools/quic/test_tools/quic_dispatcher_peer.cc
@@ -42,6 +42,12 @@ QuicConnectionHelperInterface* QuicDispatcherPeer::GetHelper(
 }
 
 // static
+QuicAlarmFactory* QuicDispatcherPeer::GetAlarmFactory(
+    QuicDispatcher* dispatcher) {
+  return dispatcher->alarm_factory_.get();
+}
+
+// static
 QuicDispatcher::WriteBlockedList* QuicDispatcherPeer::GetWriteBlockedList(
     QuicDispatcher* dispatcher) {
   return &dispatcher->write_blocked_list_;