Landing Recent QUIC changes until 2016-07-02 02:45 UTC

net/quic/quic_session.cc

Index: net/quic/quic_session.cc
diff --git a/net/quic/quic_session.cc b/net/quic/quic_session.cc
index b232a1e71f6e4a49ed9549e390242559bea7aed9..788cc68ba6ce643f776636bd2eb8970b07e734c4 100644
--- a/net/quic/quic_session.cc
+++ b/net/quic/quic_session.cc
@@ -121,7 +121,7 @@ void QuicSession::OnConnectionClosed(QuicErrorCode error,
   }
 
   while (!dynamic_stream_map_.empty()) {
-    StreamMap::iterator it = dynamic_stream_map_.begin();
+    DynamicStreamMap::iterator it = dynamic_stream_map_.begin();
     QuicStreamId id = it->first;
     it->second->OnConnectionClosed(error, source);
     // The stream should call CloseStream as part of OnConnectionClosed.
@@ -308,7 +308,7 @@ void QuicSession::InsertLocallyClosedStreamsHighestOffset(
 void QuicSession::CloseStreamInner(QuicStreamId stream_id, bool locally_reset) {
   DVLOG(1) << ENDPOINT << "Closing stream " << stream_id;
 
-  StreamMap::iterator it = dynamic_stream_map_.find(stream_id);
+  DynamicStreamMap::iterator it = dynamic_stream_map_.find(stream_id);
   if (it == dynamic_stream_map_.end()) {
     // When CloseStreamInner has been called recursively (via
     // ReliableQuicStream::OnClose), the stream will already have been deleted
@@ -615,7 +615,7 @@ QuicStreamId QuicSession::GetNextOutgoingStreamId() {
 
 ReliableQuicStream* QuicSession::GetOrCreateStream(
     const QuicStreamId stream_id) {
-  StreamMap::iterator it = static_stream_map_.find(stream_id);
+  StaticStreamMap::iterator it = static_stream_map_.find(stream_id);
   if (it != static_stream_map_.end()) {
     return it->second;
   }
@@ -679,7 +679,7 @@ ReliableQuicStream* QuicSession::GetOrCreateDynamicStream(
   DCHECK(!ContainsKey(static_stream_map_, stream_id))
       << "Attempt to call GetOrCreateDynamicStream for a static stream";
 
-  StreamMap::iterator it = dynamic_stream_map_.find(stream_id);
+  DynamicStreamMap::iterator it = dynamic_stream_map_.find(stream_id);
   if (it != dynamic_stream_map_.end()) {
     return it->second;
   }