Minor cleanup in SpdySession.

net/spdy/spdy_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/spdy/spdy_session.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <utility>
@@ skipping 1996 matching lines @@
   stream->OnDataReceived(std::move(buffer));
 }
 
 void SpdySession::OnStreamEnd(SpdyStreamId stream_id) {
   CHECK(in_io_loop_);
   if (net_log().IsCapturing()) {
     net_log().AddEvent(NetLogEventType::HTTP2_SESSION_RECV_DATA,
                        base::Bind(&NetLogSpdyDataCallback, stream_id, 0, true));
   }
 
-  // Build the buffer as early as possible so that we go through the
-  // session flow control checks and update
-  // |unacked_recv_window_bytes_| properly even when the stream is
-  // inactive (since the other side has still reduced its session send
-  // window).
-  std::unique_ptr<SpdyBuffer> buffer;
-
   ActiveStreamMap::iterator it = active_streams_.find(stream_id);
-
   // By the time data comes in, the stream may already be inactive.
   if (it == active_streams_.end())
     return;
 
   SpdyStream* stream = it->second;
   CHECK_EQ(stream->stream_id(), stream_id);
 
-  stream->OnDataReceived(std::move(buffer));
+  stream->OnDataReceived(std::unique_ptr<SpdyBuffer>());
 }
 
 void SpdySession::OnStreamPadding(SpdyStreamId stream_id, size_t len) {
   CHECK(in_io_loop_);
 
   // Decrease window size because padding bytes are received.
   // Increase window size because padding bytes are consumed (by discarding).
   // Net result: |session_unacked_recv_window_bytes_| increases by |len|,
   // |session_recv_window_size_| does not change.
   DecreaseRecvWindowSize(static_cast<int32_t>(len));
@@ skipping 501 matching lines @@
         "Received duplicate pushed stream with url: " + gurl.spec());
     return;
   }
 
   std::unique_ptr<SpdyStream> stream(
       new SpdyStream(SPDY_PUSH_STREAM, GetWeakPtr(), gurl, request_priority,
                      stream_initial_send_window_size_,
                      stream_max_recv_window_size_, net_log_));
   stream->set_stream_id(stream_id);
 
-  // In HTTP2 PUSH_PROMISE arrives on associated stream.
-  if (associated_it != active_streams_.end()) {
-    associated_it->second->AddRawReceivedBytes(last_compressed_frame_len_);
-  } else {
-    stream->AddRawReceivedBytes(last_compressed_frame_len_);

[Bence, 2016/11/29 00:28:44]

Return around line 2479 makes this branch dead.

-  }
-
+  // PUSH_PROMISE arrives on associated stream.
+  associated_it->second.stream->AddRawReceivedBytes(last_compressed_frame_len_);
   last_compressed_frame_len_ = 0;
 
   UnclaimedPushedStreamContainer::const_iterator inserted_pushed_it =
       unclaimed_pushed_streams_.insert(pushed_it, gurl, stream_id,
                                        time_func_());
   DCHECK(inserted_pushed_it != pushed_it);
   DeleteExpiredPushedStreams();
 
   InsertActivatedStream(std::move(stream));
 
@@ skipping 435 matching lines @@
     if (!queue->empty()) {
       SpdyStreamId stream_id = queue->front();
       queue->pop_front();
       return stream_id;
     }
   }
   return 0;
 }
 
 }  // namespace net