Ensure SpdySession::StartGoingAway is always called with an error.

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 <map>
 
 #include "base/basictypes.h"
@@ skipping 1580 matching lines @@
   error_on_close_ = err;
 
   net_log_.AddEvent(
       NetLog::TYPE_SPDY_SESSION_CLOSE,
       base::Bind(&NetLogSpdySessionCloseCallback, err, &description));
 
   UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SpdySession.ClosedOnError", -err);
   UMA_HISTOGRAM_CUSTOM_COUNTS("Net.SpdySession.BytesRead.OtherErrors",
                               total_bytes_received_, 1, 100000000, 50);
 
-  StartGoingAway(0, err);
+  if (err == OK) {
+    // We ought to be going away already, as this is a graceful close.
+    DcheckGoingAway();
+    StartGoingAway(0, ERR_ABORTED);

[Ryan Hamilton, 2014/06/11 17:05:59]

Hm. Handling DCHECKS is verboten in Chrome. (There's a thread about this on
chromium-dev in the last day or so). You could use a DFATAL, however.

[Johnny, 2014/06/11 17:17:20]

Removed.

+  } else {
+    StartGoingAway(0, err);
+  }
   DcheckDraining();
   MaybePostWriteLoop();
 }
 
 void SpdySession::LogAbandonedStream(SpdyStream* stream, Error status) {
   DCHECK(stream);
   std::string description = base::StringPrintf(
       "ABANDONED (stream_id=%d): ", stream->stream_id()) +
       stream->url().spec();
   stream->LogStreamError(status, description);
@@ skipping 20 matching lines @@
 
 SpdyStreamId SpdySession::GetNewStreamId() {
   CHECK_LE(stream_hi_water_mark_, kLastStreamId);
   SpdyStreamId id = stream_hi_water_mark_;
   stream_hi_water_mark_ += 2;
   return id;
 }
 
 void SpdySession::CloseSessionOnError(Error err,
                                       const std::string& description) {
+  DCHECK_LT(err, ERR_IO_PENDING);
   DoDrainSession(err, description);
 }
 
 void SpdySession::MakeUnavailable() {
   if (availability_state_ == STATE_AVAILABLE) {
     availability_state_ = STATE_GOING_AWAY;
     pool_->MakeSessionUnavailable(GetWeakPtr());
   }
 }
 
@@ skipping 1357 matching lines @@
     if (!queue->empty()) {
       SpdyStreamId stream_id = queue->front();
       queue->pop_front();
       return stream_id;
     }
   }
   return 0;
 }
 
 }  // namespace net