Revert 113300 - Revert of 112134 of Revert 112130 - Close idle connections / SPDY sessions when n...

net/spdy/spdy_session.cc

Index: net/spdy/spdy_session.cc
===================================================================
--- net/spdy/spdy_session.cc	(revision 113304)
+++ net/spdy/spdy_session.cc	(working copy)
@@ -336,7 +336,6 @@
 
   state_ = CONNECTED;
   connection_.reset(connection);
-  connection_->AddLayeredPool(this);
   is_secure_ = is_secure;
   certificate_error_code_ = certificate_error_code;
 
@@ -985,15 +984,6 @@
   return connection_->socket()->GetLocalAddress(address);
 }
 
-bool SpdySession::CloseOneIdleConnection() {
-  if (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));
@@ -1028,18 +1018,12 @@
   if (stream)
     stream->OnClose(status);
   ProcessPendingCreateStreams();
-  if (num_active_streams() == 0 && connection_->is_initialized() &&
-      connection_->IsPoolStalled()) {
-    // Should delete this.
-    RemoveFromPool();
-  }
 }
 
 void SpdySession::RemoveFromPool() {
   if (spdy_session_pool_) {
-    SpdySessionPool* pool = spdy_session_pool_;
+    spdy_session_pool_->Remove(make_scoped_refptr(this));
     spdy_session_pool_ = NULL;
-    pool->Remove(make_scoped_refptr(this));
   }
 }