Landing recent QUIC changes until 7:19 PM, Feb 26, 2016 UTC-5.

net/quic/quic_session.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/quic_session.h"
 
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "net/quic/crypto/proof_verifier.h"
@@ skipping 657 matching lines @@
     return nullptr;
   }
 
   available_streams_.erase(stream_id);
 
   if (!MaybeIncreaseLargestPeerStreamId(stream_id)) {
     return nullptr;
   }
   // Check if the new number of open streams would cause the number of
   // open streams to exceed the limit.
-  size_t num_open_incoming_streams =
-      FLAGS_quic_distinguish_incoming_outgoing_streams
-          ? GetNumOpenIncomingStreams()
-          : dynamic_stream_map_.size() - draining_streams_.size() +
-                locally_closed_streams_highest_offset_.size();
-  if (num_open_incoming_streams >= max_open_incoming_streams()) {
+  if (GetNumOpenIncomingStreams() >= max_open_incoming_streams()) {
     if (connection()->version() <= QUIC_VERSION_27) {
       connection()->SendConnectionCloseWithDetails(
           QUIC_TOO_MANY_OPEN_STREAMS, "Old style stream rejection");
     } else {
       // Refuse to open the stream.
       SendRstStream(stream_id, QUIC_REFUSED_STREAM, 0);
     }
     return nullptr;
   }
 
-  ReliableQuicStream* stream = CreateIncomingDynamicStream(stream_id);
-  if (stream == nullptr) {
-    return nullptr;
-  }
-  ActivateStream(stream);
-  return stream;
+  return CreateIncomingDynamicStream(stream_id);
 }
 
 void QuicSession::set_max_open_incoming_streams(
     size_t max_open_incoming_streams) {
   DVLOG(1) << "Setting max_open_incoming_streams_ to "
            << max_open_incoming_streams;
   max_open_incoming_streams_ = max_open_incoming_streams;
   DVLOG(1) << "MaxAvailableStreams() became " << MaxAvailableStreams();
 }
 
@@ skipping 107 matching lines @@
 
 size_t QuicSession::MaxAvailableStreams() const {
   return max_open_incoming_streams_ * kMaxAvailableStreamsMultiplier;
 }
 
 bool QuicSession::IsIncomingStream(QuicStreamId id) const {
   return id % 2 != next_outgoing_stream_id_ % 2;
 }
 
 }  // namespace net