diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-24 02:49:33 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-24 02:49:33 +0000 |
| commit | e34400c317d87d7b60acaa3cba7ca4885201c483 (patch) | |
| tree | eb5e11bb4ab6b25b220648cb346d2a6d712de133 /net/spdy/spdy_session.h | |
| parent | 8a825a77279ce099a99fc1a1c2157ddf4f3fde1a (diff) | |
| download | chromium_src-e34400c317d87d7b60acaa3cba7ca4885201c483.zip chromium_src-e34400c317d87d7b60acaa3cba7ca4885201c483.tar.gz chromium_src-e34400c317d87d7b60acaa3cba7ca4885201c483.tar.bz2 | |
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
Diffstat (limited to 'net/spdy/spdy_session.h')
| -rw-r--r-- | net/spdy/spdy_session.h | 8 |
1 files changed, 2 insertions, 6 deletions
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>; |