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

net/quic/chromium/quic_chromium_client_stream.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/chromium/quic_chromium_client_stream.h"
 
 #include <utility>
 
 #include "base/bind_helpers.h"
 #include "base/callback_helpers.h"
@@ skipping 91 matching lines @@
   // will be able to, potentially, read all data which has queued up.
   NotifyDelegateOfDataAvailableLater();
 }
 
 void QuicChromiumClientStream::OnClose() {
   if (delegate_) {
     delegate_->OnClose();
     delegate_ = nullptr;
     delegate_tasks_.clear();
   }
-  ReliableQuicStream::OnClose();
+  QuicStream::OnClose();
 }
 
 void QuicChromiumClientStream::OnCanWrite() {
-  ReliableQuicStream::OnCanWrite();
+  QuicStream::OnCanWrite();
 
   if (!HasBufferedData() && !callback_.is_null()) {
     base::ResetAndReturn(&callback_).Run(OK);
   }
 }
 
 size_t QuicChromiumClientStream::WriteHeaders(
     SpdyHeaderBlock header_block,
     bool fin,
     QuicAckListenerInterface* ack_notifier_delegate) {
@@ skipping 157 matching lines @@
 
 void QuicChromiumClientStream::DisableConnectionMigration() {
   can_migrate_ = false;
 }
 
 bool QuicChromiumClientStream::IsFirstStream() {
   return id() == kHeadersStreamId + 2;
 }
 
 }  // namespace net