Landing Recent QUIC changes until 2016-07-02 02:45 UTC

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 "net/quic/iovector.h"
 #include "net/quic/quic_bug_tracker.h"
 #include "net/quic/quic_flags.h"
@@ skipping 272 matching lines @@
   // A FIN with zero data payload should not be flow control blocked.
   bool fin_with_zero_data = (fin && write_length == 0);
 
   // How much data flow control permits to be written.
   QuicByteCount send_window = flow_controller_.SendWindowSize();
   if (stream_contributes_to_connection_flow_control_) {
     send_window =
         min(send_window, connection_flow_controller_->SendWindowSize());
   }
 
-  if (FLAGS_quic_cede_correctly && session_->ShouldYield(id())) {
+  if (session_->ShouldYield(id())) {
     session_->MarkConnectionLevelWriteBlocked(id());
     return QuicConsumedData(0, false);
   }
 
   if (send_window == 0 && !fin_with_zero_data) {
     // Quick return if nothing can be sent.
     MaybeSendBlocked();
     return QuicConsumedData(0, false);
   }
 
@@ skipping 162 matching lines @@
   }
 }
 
 void ReliableQuicStream::UpdateSendWindowOffset(QuicStreamOffset new_window) {
   if (flow_controller_.UpdateSendWindowOffset(new_window)) {
     OnCanWrite();
   }
 }
 
 }  // namespace net