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

net/quic/quic_stream_factory.h

Index: net/quic/quic_stream_factory.h
diff --git a/net/quic/quic_stream_factory.h b/net/quic/quic_stream_factory.h
index 1500d4a567aa55c18abbef2381f52f115a75ecd6..5a9ee860fdea9df56fd547d2dcf9279038ab737d 100644
--- a/net/quic/quic_stream_factory.h
+++ b/net/quic/quic_stream_factory.h
@@ -49,6 +49,7 @@ class CTVerifier;
 class HostResolver;
 class HttpServerProperties;
 class QuicClock;
+class QuicChromiumAlarmFactory;
 class QuicChromiumClientSession;
 class QuicChromiumConnectionHelper;
 class QuicCryptoClientStreamFactory;
@@ -303,6 +304,8 @@ class NET_EXPORT_PRIVATE QuicStreamFactory
 
   QuicChromiumConnectionHelper* helper() { return helper_.get(); }
 
+  QuicChromiumAlarmFactory* alarm_factory() { return alarm_factory_.get(); }
+
   bool enable_port_selection() const { return enable_port_selection_; }
 
   bool has_quic_server_info_factory() {
@@ -428,6 +431,9 @@ class NET_EXPORT_PRIVATE QuicStreamFactory
   // The helper used for all connections.
   std::unique_ptr<QuicChromiumConnectionHelper> helper_;
 
+  // The alarm factory used for all connections.
+  std::unique_ptr<QuicChromiumAlarmFactory> alarm_factory_;
+
   // Contains owning pointers to all sessions that currently exist.
   SessionIdMap all_sessions_;
   // Contains non-owning pointers to currently active session