Land Recent QUIC Changes until 03/06/2015.

net/quic/reliable_quic_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/reliable_quic_stream.h"
 
 #include "base/logging.h"
 #include "base/profiler/scoped_tracker.h"
 #include "net/quic/iovector.h"
 #include "net/quic/quic_flow_controller.h"
@@ skipping 78 matching lines @@
   // Original delegate.  delegate_->OnAckNotification will be called when:
   //   wrote_last_data_ == true and pending_acks_ == 0
   scoped_refptr<DelegateInterface> delegate_;
 
   // Number of outstanding acks.
   int pending_acks_;
 
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyAckNotifierDelegate);
 };
 
 ReliableQuicStream::PendingData::PendingData(
     string data_in, scoped_refptr<ProxyAckNotifierDelegate> delegate_in)
     : data(data_in), delegate(delegate_in) {
 }
@@ skipping 121 matching lines @@
           "422516 ReliableQuicStream::CloseConnection"));
 
   session()->connection()->SendConnectionClose(error);
 }
 
 void ReliableQuicStream::CloseConnectionWithDetails(QuicErrorCode error,
                                                     const string& details) {
   session()->connection()->SendConnectionCloseWithDetails(error, details);
 }
 
-QuicVersion ReliableQuicStream::version() const {
-  return session()->connection()->version();
-}
-
 void ReliableQuicStream::WriteOrBufferData(
     StringPiece data,
     bool fin,
     QuicAckNotifier::DelegateInterface* ack_notifier_delegate) {
   if (data.empty() && !fin) {
     LOG(DFATAL) << "data.empty() && !fin";
     return;
   }
 
   if (fin_buffered_) {
@@ skipping 245 matching lines @@
     connection_flow_controller_->AddBytesConsumed(bytes);
   }
 }
 
 void ReliableQuicStream::UpdateSendWindowOffset(QuicStreamOffset new_window) {
   if (flow_controller_.UpdateSendWindowOffset(new_window)) {
     OnCanWrite();
   }
 }
 
-bool ReliableQuicStream::IsFlowControlBlocked() {
-  if (flow_controller_.IsBlocked()) {
-    return true;
-  }
-  return stream_contributes_to_connection_flow_control_ &&
-      connection_flow_controller_->IsBlocked();
-}
-
 }  // namespace net