Revert r113405, since it appears to be causing a crash and a hang. Also reverted r118506 since it is no longer applicable.

BUG=109876, 110368, 62364, 92244

Review URL: https://chromiumcodereview.appspot.com/9226039

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118788 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 2 insertions, 21 deletions

diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index 27df797..16188b8 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -337,7 +337,6 @@ net::Error SpdySession::InitializeWithSocket(
 
   state_ = CONNECTED;
   connection_.reset(connection);
-  connection_->AddLayeredPool(this);
   is_secure_ = is_secure;
   certificate_error_code_ = certificate_error_code;
 
@@ -1002,15 +1001,6 @@ int SpdySession::GetLocalAddress(IPEndPoint* address) const {
   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));
@@ -1045,11 +1035,6 @@ void SpdySession::DeleteStream(spdy::SpdyStreamId id, int status) {
   if (stream)
     stream->OnClose(status);
   ProcessPendingCreateStreams();
-  if (num_active_streams() == 0 && connection_->is_initialized() &&
-      connection_->IsPoolStalled()) {
-    // Should delete this.
-    RemoveFromPool();
-  }
 }
 
 void SpdySession::RemoveFromPool() {
diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
index 2fc6621..f2b260f 100644
--- a/net/spdy/spdy_session.h
+++ b/net/spdy/spdy_session.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -46,8 +46,7 @@ class SpdyStream;
 class SSLInfo;
 
 class NET_EXPORT SpdySession : public base::RefCounted<SpdySession>,
-                               public spdy::BufferedSpdyFramerVisitorInterface,
-                               public LayeredPool {
+                               public spdy::BufferedSpdyFramerVisitorInterface {
  public:
   // Create a new SpdySession.
   // |host_port_proxy_pair| is the host/port that this session connects to, and
@@ -237,9 +236,6 @@ class NET_EXPORT SpdySession : public base::RefCounted<SpdySession>,
   int GetPeerAddress(AddressList* address) const;
   int GetLocalAddress(IPEndPoint* address) const;
 
-  // LayeredPool implementation.
-  virtual bool CloseOneIdleConnection() OVERRIDE;
-
  private:
   friend class base::RefCounted<SpdySession>;