diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-17 23:13:09 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-17 23:13:09 +0000 |
| commit | 3598c6021c4a79bc954153c6f02140826229e254 (patch) | |
| tree | b04ac8b7cee717886e794bd7c6e034d4920d0ed0 /net/socket/client_socket_pool_base.h | |
| parent | be825e07f72cada135d8fca0130bb2beccc0374c (diff) | |
| download | chromium_src-3598c6021c4a79bc954153c6f02140826229e254.zip chromium_src-3598c6021c4a79bc954153c6f02140826229e254.tar.gz chromium_src-3598c6021c4a79bc954153c6f02140826229e254.tar.bz2 | |
Break reference cycle from HttpProxyClientSocket=>HttpNetworkSession=>...
Note that this undoes the fix for http://crbug.com/49387 which is now unnecessary without the cycle.
Some other miscellaneous cleanup is thrown in here.
BUG=55175
TEST=none
Review URL: http://codereview.chromium.org/3418018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59873 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/client_socket_pool_base.h')
| -rw-r--r-- | net/socket/client_socket_pool_base.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/socket/client_socket_pool_base.h b/net/socket/client_socket_pool_base.h index 69bb904..bea0b22 100644 --- a/net/socket/client_socket_pool_base.h +++ b/net/socket/client_socket_pool_base.h @@ -29,7 +29,6 @@ #include <string> #include "base/basictypes.h" -#include "base/compiler_specific.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/task.h" @@ -486,8 +485,7 @@ class ClientSocketPoolBaseHelper // make sure that they are discarded rather than reused. int pool_generation_number_; - // Some parts of this class need to know if the destructor is running. - bool in_destructor_; + DISALLOW_COPY_AND_ASSIGN(ClientSocketPoolBaseHelper); }; } // namespace internal |