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

net/quic/quic_client_session_base.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/quic_client_session_base.h"
 
 #include "net/quic/quic_client_promised_info.h"
 #include "net/quic/quic_flags.h"
 #include "net/quic/spdy_utils.h"
 
@@ skipping 156 matching lines @@
     return it->second.get();
   }
   return nullptr;
 }
 
 QuicSpdyStream* QuicClientSessionBase::GetPromisedStream(
     const QuicStreamId id) {
   if (IsClosedStream(id)) {
     return nullptr;
   }
-  StreamMap::iterator it = dynamic_streams().find(id);
+  DynamicStreamMap::iterator it = dynamic_streams().find(id);
   if (it != dynamic_streams().end()) {
     return static_cast<QuicSpdyStream*>(it->second);
   }
   QUIC_BUG << "Open promised stream " << id << " is missing!";
   return nullptr;
 }
 
 void QuicClientSessionBase::DeletePromised(QuicClientPromisedInfo* promised) {
   push_promise_index_->promised_by_url()->erase(promised->url());
   // Since promised_by_id_ contains the unique_ptr, this will destroy
   // promised.
   promised_by_id_.erase(promised->id());
 }
 
 void QuicClientSessionBase::ResetPromised(QuicStreamId id,
                                           QuicRstStreamErrorCode error_code) {
   SendRstStream(id, error_code, 0);
   if (!IsOpenStream(id)) {
     MaybeIncreaseLargestPeerStreamId(id);
     InsertLocallyClosedStreamsHighestOffset(id, 0);
   }
 }
 
 }  // namespace net