Close idle connections / SPDY sessions when needed

net/spdy/spdy_session.cc

Index: net/spdy/spdy_session.cc
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index cc190ec841f793a9d8a2aa824aa18df2b6c1a1a5..5572566e259bced4606282e85b9bccf4fd916e10 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -379,6 +379,7 @@ net::Error SpdySession::InitializeWithSocket(
 
   state_ = CONNECTED;
   connection_.reset(connection);
+  connection_->AddLayeredPool(this);
   is_secure_ = is_secure;
   certificate_error_code_ = certificate_error_code;
 
@@ -1176,6 +1177,15 @@ int SpdySession::GetLocalAddress(IPEndPoint* address) const {
   return connection_->socket()->GetLocalAddress(address);
 }
 
+bool SpdySession::CloseOneIdleConnection() {
+  if (spdy_session_pool_ && num_active_streams() == 0) {
+    // Should delete this.
+    RemoveFromPool();
+    return true;
+  }
+  return false;
+}
+
 void SpdySession::ActivateStream(SpdyStream* stream) {
   const spdy::SpdyStreamId id = stream->stream_id();
   DCHECK(!IsStreamActive(id));
@@ -1210,6 +1220,11 @@ void SpdySession::DeleteStream(spdy::SpdyStreamId id, int status) {
   if (stream)
     stream->OnClose(status);
   ProcessPendingCreateStreams();
+  if (num_active_streams() == 0 && connection_->is_initialized() &&
+      connection_->IsPoolStalled()) {

[mmenke, 2012/03/16 18:01:15]

Think we should have a test for this, or even land it as part of a separate CL,
out of paranoia.  This is basically the behavior I suggested we give to other
socket pools.

[Ryan Hamilton, 2012/03/16 22:21:03]

Removed for now.

+    // Should delete this.
+    RemoveFromPool();
+  }
 }
 
 void SpdySession::RemoveFromPool() {