Landing Recent QUIC changes until 10:38 AM, Oct 17, 2016 UTC-4

net/quic/test_tools/quic_session_peer.cc

Index: net/quic/test_tools/quic_session_peer.cc
diff --git a/net/quic/test_tools/quic_session_peer.cc b/net/quic/test_tools/quic_session_peer.cc
index f3d9f0d39f7591cfc1fe6443d37d498bbe25f618..a611eaf8fdbec1dc2f1989f544d34cb1d464beaa 100644
--- a/net/quic/test_tools/quic_session_peer.cc
+++ b/net/quic/test_tools/quic_session_peer.cc
@@ -67,6 +67,12 @@ QuicSession::StaticStreamMap& QuicSessionPeer::static_streams(
 }
 
 // static
+QuicSession::DynamicStreamMap& QuicSessionPeer::dynamic_streams(
+    QuicSession* session) {
+  return session->dynamic_streams();
+}
+
+// static
 std::unordered_set<QuicStreamId>* QuicSessionPeer::GetDrainingStreams(
     QuicSession* session) {
   return &session->draining_streams_;