Landing Recent QUIC changes until 12:43 PM, Nov 5, 2016 UTC+8

net/quic/test_tools/quic_session_peer.h

Index: net/quic/test_tools/quic_session_peer.h
diff --git a/net/quic/test_tools/quic_session_peer.h b/net/quic/test_tools/quic_session_peer.h
index 0aa46f83fc3dc780c6682c0264bbd677c1a651b5..59245fe72d7f64e3df38d874d8c91f3468a9e239 100644
--- a/net/quic/test_tools/quic_session_peer.h
+++ b/net/quic/test_tools/quic_session_peer.h
@@ -21,7 +21,7 @@ class QuicCryptoStream;
 class QuicHeadersStream;
 class QuicSession;
 class QuicSpdyStream;
-class ReliableQuicStream;
+class QuicStream;
 
 namespace test {
 
@@ -35,8 +35,8 @@ class QuicSessionPeer {
                                         uint32_t max_streams);
   static QuicCryptoStream* GetCryptoStream(QuicSession* session);
   static QuicWriteBlockedList* GetWriteBlockedStreams(QuicSession* session);
-  static ReliableQuicStream* GetOrCreateDynamicStream(QuicSession* session,
-                                                      QuicStreamId stream_id);
+  static QuicStream* GetOrCreateDynamicStream(QuicSession* session,
+                                              QuicStreamId stream_id);
   static std::map<QuicStreamId, QuicStreamOffset>&
   GetLocallyClosedStreamsHighestOffset(QuicSession* session);
   static QuicSession::StaticStreamMap& static_streams(QuicSession* session);
@@ -44,7 +44,7 @@ class QuicSessionPeer {
   static std::unordered_set<QuicStreamId>* GetDrainingStreams(
       QuicSession* session);
   static void ActivateStream(QuicSession* session,
-                             std::unique_ptr<ReliableQuicStream> stream);
+                             std::unique_ptr<QuicStream> stream);
 
   // Discern the state of a stream.  Exactly one of these should be true at a
   // time for any stream id > 0 (other than the special streams 1 and 3).