Landing Recent QUIC changes until Sat Apr 29 00:22:04 2017 +0000

net/quic/core/quic_server_session_base.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/core/quic_server_session_base.h"
 
 #include "net/quic/core/proto/cached_network_parameters.pb.h"
 #include "net/quic/core/quic_connection.h"
 #include "net/quic/core/quic_stream.h"
 #include "net/quic/platform/api/quic_bug_tracker.h"
@@ skipping 177 matching lines @@
   crypto_stream_->SendServerConfigUpdate(&cached_network_params);
 
   connection()->OnSendConnectionState(cached_network_params);
 
   last_scup_time_ = now;
   last_scup_packet_number_ =
       connection()->sent_packet_manager().GetLargestSentPacket();
 }
 
 bool QuicServerSessionBase::ShouldCreateIncomingDynamicStream(QuicStreamId id) {
+  DCHECK(!FLAGS_quic_reloadable_flag_quic_refactor_stream_creation);
   if (!connection()->connected()) {
     QUIC_BUG << "ShouldCreateIncomingDynamicStream called when disconnected";
     return false;
   }
 
   if (id % 2 == 0) {
     QUIC_DLOG(INFO) << "Invalid incoming even stream_id:" << id;
     connection()->CloseConnection(
         QUIC_INVALID_STREAM_ID, "Client created even numbered stream",
         ConnectionCloseBehavior::SEND_CONNECTION_CLOSE_PACKET);
     return false;
   }
   return true;
 }
 
 bool QuicServerSessionBase::ShouldCreateOutgoingDynamicStream() {
+  DCHECK(!FLAGS_quic_reloadable_flag_quic_refactor_stream_creation);
   if (!connection()->connected()) {
     QUIC_BUG << "ShouldCreateOutgoingDynamicStream called when disconnected";
     return false;
   }
   if (!crypto_stream_->encryption_established()) {
     QUIC_BUG << "Encryption not established so no outgoing stream created.";
     return false;
   }
   if (GetNumOpenOutgoingStreams() >= max_open_outgoing_streams()) {
     VLOG(1) << "No more streams should be created. "
@@ skipping 14 matching lines @@
 
 int32_t QuicServerSessionBase::BandwidthToCachedParameterBytesPerSecond(
     const QuicBandwidth& bandwidth) {
   int64_t bytes_per_second = bandwidth.ToBytesPerSecond();
   return (bytes_per_second > static_cast<int64_t>(INT32_MAX)
               ? INT32_MAX
               : static_cast<int32_t>(bytes_per_second));
 }
 
 }  // namespace net