Landing Recent QUIC changes until Sat Oct 29 14:59:35.

net/quic/core/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/core/quic_session.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
@@ skipping 141 matching lines @@
   if (stream_id == kConnectionLevelId) {
     // This is a window update that applies to the connection, rather than an
     // individual stream.
     DVLOG(1) << ENDPOINT << "Received connection level flow control window "
                             "update with byte offset: "
              << frame.byte_offset;
     flow_controller_.UpdateSendWindowOffset(frame.byte_offset);
     return;
   }
   ReliableQuicStream* stream = GetOrCreateStream(stream_id);
-  if (stream) {
+  if (stream != nullptr) {
     stream->OnWindowUpdateFrame(frame);
   }
 }
 
 void QuicSession::OnBlockedFrame(const QuicBlockedFrame& frame) {
   // TODO(rjshade): Compare our flow control receive windows for specified
   //                streams: if we have a large window then maybe something
   //                had gone wrong with the flow control accounting.
   DVLOG(1) << ENDPOINT
            << "Received BLOCKED frame with stream id: " << frame.stream_id;
@@ skipping 451 matching lines @@
   }
 
   // Check if the new number of available streams would cause the number of
   // available streams to exceed the limit.  Note that the peer can create
   // only alternately-numbered streams.
   size_t additional_available_streams =
       (stream_id - largest_peer_created_stream_id_) / 2 - 1;
   size_t new_num_available_streams =
       GetNumAvailableStreams() + additional_available_streams;
   if (new_num_available_streams > MaxAvailableStreams()) {
-    DVLOG(1) << "Failed to create a new incoming stream with id:" << stream_id
+    DVLOG(1) << ENDPOINT
+             << "Failed to create a new incoming stream with id:" << stream_id
              << ".  There are already " << GetNumAvailableStreams()
              << " streams available, which would become "
              << new_num_available_streams << ", which exceeds the limit "
              << MaxAvailableStreams() << ".";
     string details = IntToString(new_num_available_streams) + " above " +
                      IntToString(MaxAvailableStreams());
     connection()->CloseConnection(
         QUIC_TOO_MANY_AVAILABLE_STREAMS, details.c_str(),
         ConnectionCloseBehavior::SEND_CONNECTION_CLOSE_PACKET);
     return false;
@@ skipping 174 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