Deprecate instead of close SPDY sessions upon network change.

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 2267 matching lines @@
 
   if (availability_state_ == STATE_CLOSED)
     return;
 
   net_log_.AddEvent(NetLog::TYPE_SPDY_SESSION_GOAWAY,
       base::Bind(&NetLogSpdyGoAwayCallback,
                  last_accepted_stream_id,
                  active_streams_.size(),
                  unclaimed_pushed_streams_.size(),
                  status));
+  MakeUnavailable();
+  StartGoingAway(last_accepted_stream_id, ERR_ABORTED);
+  // This is to handle the case when we already don't have any active
+  // streams (i.e., StartGoingAway() did nothing). Otherwise, we have
+  // active streams and so the last one being closed will finish the
+  // going away process (see DeleteStream()).
+  MaybeFinishGoingAway();
+}
+
+void SpdySession::MakeUnavailable() {

[akalin, 2014/01/29 23:26:18]

move this under CloseSessionAndError to match header

   if (availability_state_ < STATE_GOING_AWAY) {
     availability_state_ = STATE_GOING_AWAY;
     // |pool_| will be NULL when |InitializeWithSocket()| is in the
     // call stack.
     if (pool_)
       pool_->MakeSessionUnavailable(GetWeakPtr());
   }
-  StartGoingAway(last_accepted_stream_id, ERR_ABORTED);
-  // This is to handle the case when we already don't have any active
-  // streams (i.e., StartGoingAway() did nothing). Otherwise, we have
-  // active streams and so the last one being closed will finish the
-  // going away process (see DeleteStream()).
-  MaybeFinishGoingAway();
 }
 
 void SpdySession::OnPing(uint32 unique_id) {
   CHECK(in_io_loop_);
 
   if (availability_state_ == STATE_CLOSED)
     return;
 
   net_log_.AddEvent(
       NetLog::TYPE_SPDY_SESSION_PING,
@@ skipping 635 matching lines @@
     if (!queue->empty()) {
       SpdyStreamId stream_id = queue->front();
       queue->pop_front();
       return stream_id;
     }
   }
   return 0;
 }
 
 }  // namespace net