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/socket/client_socket_handle.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/socket/client_socket_handle.h')
| -rw-r--r-- | net/socket/client_socket_handle.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/socket/client_socket_handle.h b/net/socket/client_socket_handle.h index c180832..0b9a652 100644 --- a/net/socket/client_socket_handle.h +++ b/net/socket/client_socket_handle.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. @@ -92,10 +92,6 @@ class NET_EXPORT ClientSocketHandle { // initialized the ClientSocketHandle. LoadState GetLoadState() const; - bool IsPoolStalled() const; - - void AddLayeredPool(LayeredPool* layered_pool); - // Returns true when Init() has completed successfully. bool is_initialized() const { return is_initialized_; } @@ -168,7 +164,6 @@ class NET_EXPORT ClientSocketHandle { bool is_initialized_; ClientSocketPool* pool_; - LayeredPool* layered_pool_; scoped_ptr<StreamSocket> socket_; std::string group_name_; bool is_reused_; |