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

net/quic/chromium/quic_chromium_client_stream.cc

Index: net/quic/chromium/quic_chromium_client_stream.cc
diff --git a/net/quic/chromium/quic_chromium_client_stream.cc b/net/quic/chromium/quic_chromium_client_stream.cc
index 90e5b05f912f6fe84cb79166124005add49058e7..e7c4c8421669c30cb70632e4d3675e5a769874fa 100644
--- a/net/quic/chromium/quic_chromium_client_stream.cc
+++ b/net/quic/chromium/quic_chromium_client_stream.cc
@@ -109,11 +109,11 @@ void QuicChromiumClientStream::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);