Landing Recent QUIC changes until 10:38 AM, Oct 17, 2016 UTC-4

net/quic/core/quic_spdy_session.cc

Index: net/quic/core/quic_spdy_session.cc
diff --git a/net/quic/core/quic_spdy_session.cc b/net/quic/core/quic_spdy_session.cc
index 1e8d82c0110c638bff1baf9929cfa66be7d78105..5600509560368d01f09da94816fef7ada93a1c8b 100644
--- a/net/quic/core/quic_spdy_session.cc
+++ b/net/quic/core/quic_spdy_session.cc
@@ -157,24 +157,12 @@ void QuicSpdySession::OnConfigNegotiated() {
   const QuicVersion version = connection()->version();
   if (version > QUIC_VERSION_35 && config()->ForceHolBlocking(perspective())) {
     force_hol_blocking_ = true;
-    if (!FLAGS_quic_bugfix_fhol_writev_fin_only_v2) {
-      // Autotuning makes sure that the headers stream flow control does
-      // not get in the way, and normal stream and connection level flow
-      // control are active anyway. This is really only for the client
-      // side (and mainly there just in tests and toys), where
-      // autotuning and/or large buffers are not enabled by default.
-      headers_stream_->flow_controller()->set_auto_tune_receive_window(true);
-    } else {
-      // Since all streams are tunneled through the headers stream, it
-      // is important that headers stream never flow control blocks.
-      // Otherwise, busy-loop behaviour can ensue where data streams
-      // data try repeatedly to write data not realizing that the
-      // tunnel through the headers stream is blocked.
-      headers_stream_->flow_controller()->UpdateReceiveWindowSize(
-          kStreamReceiveWindowLimit);
-      headers_stream_->flow_controller()->UpdateSendWindowOffset(
-          kStreamReceiveWindowLimit);
-    }
+    // Autotuning makes sure that the headers stream flow control does
+    // not get in the way, and normal stream and connection level flow
+    // control are active anyway. This is really only for the client
+    // side (and mainly there just in tests and toys), where
+    // autotuning and/or large buffers are not enabled by default.
+    headers_stream_->flow_controller()->set_auto_tune_receive_window(true);
   }
 
   if (version > QUIC_VERSION_34) {