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

net/quic/test_tools/quic_session_peer.cc

 // Copyright (c) 2012 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/test_tools/quic_session_peer.h"
 
 #include "base/stl_util.h"
 #include "net/quic/core/quic_session.h"
-#include "net/quic/core/reliable_quic_stream.h"
+#include "net/quic/core/quic_stream.h"
 
 namespace net {
 namespace test {
 
 // static
 QuicStreamId QuicSessionPeer::GetNextOutgoingStreamId(QuicSession* session) {
   return session->GetNextOutgoingStreamId();
 }
 
 // static
@@ skipping 19 matching lines @@
   return session->GetCryptoStream();
 }
 
 // static
 QuicWriteBlockedList* QuicSessionPeer::GetWriteBlockedStreams(
     QuicSession* session) {
   return &session->write_blocked_streams_;
 }
 
 // static
-ReliableQuicStream* QuicSessionPeer::GetOrCreateDynamicStream(
-    QuicSession* session,
-    QuicStreamId stream_id) {
+QuicStream* QuicSessionPeer::GetOrCreateDynamicStream(QuicSession* session,
+                                                      QuicStreamId stream_id) {
   return session->GetOrCreateDynamicStream(stream_id);
 }
 
 // static
 std::map<QuicStreamId, QuicStreamOffset>&
 QuicSessionPeer::GetLocallyClosedStreamsHighestOffset(QuicSession* session) {
   return session->locally_closed_streams_highest_offset_;
 }
 
 // static
 QuicSession::StaticStreamMap& QuicSessionPeer::static_streams(
     QuicSession* session) {
   return session->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_;
 }
 
 // static
-void QuicSessionPeer::ActivateStream(
-    QuicSession* session,
-    std::unique_ptr<ReliableQuicStream> stream) {
+void QuicSessionPeer::ActivateStream(QuicSession* session,
+                                     std::unique_ptr<QuicStream> stream) {
   return session->ActivateStream(std::move(stream));
 }
 
 // static
 bool QuicSessionPeer::IsStreamClosed(QuicSession* session, QuicStreamId id) {
   DCHECK_NE(0u, id);
   return session->IsClosedStream(id);
 }
 
 // static
@@ skipping 15 matching lines @@
     // locally-created stream.
     return id >= session->next_outgoing_stream_id_;
   } else {
     // peer-created stream.
     return id > session->largest_peer_created_stream_id_;
   }
 }
 
 }  // namespace test
 }  // namespace net