Land Recent QUIC Changes.

net/quic/quic_flow_controller.cc

 // Copyright 2014 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/quic_flow_controller.h"
 
 #include "base/basictypes.h"
 #include "net/quic/quic_connection.h"
 #include "net/quic/quic_flags.h"
 #include "net/quic/quic_protocol.h"
@@ skipping 164 matching lines @@
 }
 
 void QuicFlowController::Disable() {
   is_enabled_ = false;
 }
 
 bool QuicFlowController::IsEnabled() const {
   bool connection_flow_control_enabled =
       (id_ == kConnectionLevelId &&
        FLAGS_enable_quic_connection_flow_control_2);
-  bool stream_flow_control_enabled =
-      (id_ != kConnectionLevelId &&
-       FLAGS_enable_quic_stream_flow_control_2);
+  bool stream_flow_control_enabled = (id_ != kConnectionLevelId);
   return (connection_flow_control_enabled || stream_flow_control_enabled) &&
          is_enabled_;
 }
 
 bool QuicFlowController::IsBlocked() const {
   return IsEnabled() && SendWindowSize() == 0;
 }
 
 uint64 QuicFlowController::SendWindowSize() const {
   if (bytes_sent_ > send_window_offset_) {
     return 0;
   }
   return send_window_offset_ - bytes_sent_;
 }
 
 }  // namespace net