Land Recent QUIC Changes until 03/06/2015.

net/quic/reliable_quic_stream.cc

Index: net/quic/reliable_quic_stream.cc
diff --git a/net/quic/reliable_quic_stream.cc b/net/quic/reliable_quic_stream.cc
index c997d6b8e5e893f2c50775513f264977500f71ba..adb805197c77693f88362c43a80d3f7fe6e126e3 100644
--- a/net/quic/reliable_quic_stream.cc
+++ b/net/quic/reliable_quic_stream.cc
@@ -96,9 +96,6 @@ class ReliableQuicStream::ProxyAckNotifierDelegate
   // True if no pending writes remain.
   bool wrote_last_data_;
 
-  // Accumulators.
-  int num_original_packets_;
-  int num_original_bytes_;
   int num_retransmitted_packets_;
   int num_retransmitted_bytes_;
 
@@ -240,10 +237,6 @@ void ReliableQuicStream::CloseConnectionWithDetails(QuicErrorCode error,
   session()->connection()->SendConnectionCloseWithDetails(error, details);
 }
 
-QuicVersion ReliableQuicStream::version() const {
-  return session()->connection()->version();
-}
-
 void ReliableQuicStream::WriteOrBufferData(
     StringPiece data,
     bool fin,
@@ -509,12 +502,4 @@ void ReliableQuicStream::UpdateSendWindowOffset(QuicStreamOffset new_window) {
   }
 }
 
-bool ReliableQuicStream::IsFlowControlBlocked() {
-  if (flow_controller_.IsBlocked()) {
-    return true;
-  }
-  return stream_contributes_to_connection_flow_control_ &&
-      connection_flow_controller_->IsBlocked();
-}
-
 }  // namespace net