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

net/quic/quartc/quartc_session.cc

Index: net/quic/quartc/quartc_session.cc
diff --git a/net/quic/quartc/quartc_session.cc b/net/quic/quartc/quartc_session.cc
index 7b52b12847557cd5ac665129c0038ccf4b20fe68..b89dc07734975013b4935b09087a2f8ee2454e85 100644
--- a/net/quic/quartc/quartc_session.cc
+++ b/net/quic/quartc/quartc_session.cc
@@ -162,7 +162,7 @@ void QuartcSession::OnCryptoHandshakeEvent(CryptoHandshakeEvent event) {
 void QuartcSession::CloseStream(QuicStreamId stream_id) {
   if (IsClosedStream(stream_id)) {
     // When CloseStream has been called recursively (via
-    // ReliableQuicStream::OnClose), the stream is already closed so return.
+    // QuicStream::OnClose), the stream is already closed so return.
     return;
   }
   write_blocked_streams()->UnregisterStream(stream_id);
@@ -262,8 +262,7 @@ void QuartcSession::SetServerCryptoConfig(
   quic_crypto_server_config_.reset(server_config);
 }
 
-ReliableQuicStream* QuartcSession::CreateIncomingDynamicStream(
-    QuicStreamId id) {
+QuicStream* QuartcSession::CreateIncomingDynamicStream(QuicStreamId id) {
   QuartcStream* stream = CreateDataStream(id, kDefaultPriority);
   if (stream) {
     DCHECK(session_delegate_);
@@ -281,7 +280,7 @@ QuartcStream* QuartcSession::CreateDataStream(QuicStreamId id,
   QuartcStream* stream = new QuartcStream(id, this);
   if (stream) {
     // Make QuicSession take ownership of the stream.
-    ActivateStream(std::unique_ptr<ReliableQuicStream>(stream));
+    ActivateStream(std::unique_ptr<QuicStream>(stream));
     // Register the stream to the QuicWriteBlockedList. |priority| is clamped
     // between 0 and 7, with 0 being the highest priority and 7 the lowest
     // priority.