diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-09 02:51:34 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-09 02:51:34 +0000 |
| commit | f9610ab5622cef8a8ac0d3ad421e0bd2d75a0d8f (patch) | |
| tree | a5901f37c0cdea06d5c7bfc1ea297b3713f19332 /net/base | |
| parent | 5af7608ac5748ad12cd27cd0e3a60901e62ea02f (diff) | |
| download | chromium_src-f9610ab5622cef8a8ac0d3ad421e0bd2d75a0d8f.zip chromium_src-f9610ab5622cef8a8ac0d3ad421e0bd2d75a0d8f.tar.gz chromium_src-f9610ab5622cef8a8ac0d3ad421e0bd2d75a0d8f.tar.bz2 | |
Stop using DestructionObserver in OCSP code. Explicilty cancel all URLRequests.
BUG=59630
TEST=none
Review URL: http://codereview.chromium.org/4119020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65479 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/net_test_suite.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/base/net_test_suite.h b/net/base/net_test_suite.h index eab3a53..00d9844 100644 --- a/net/base/net_test_suite.h +++ b/net/base/net_test_suite.h @@ -9,7 +9,9 @@ #include "base/message_loop.h" #include "base/ref_counted.h" #include "base/test/test_suite.h" +#include "build/build_config.h" #include "net/base/mock_host_resolver.h" +#include "net/ocsp/nss_ocsp.h" class NetTestSuite : public base::TestSuite { public: @@ -39,6 +41,10 @@ class NetTestSuite : public base::TestSuite { } virtual void Shutdown() { +#if defined(OS_LINUX) + net::ShutdownOCSP(); +#endif // defined(OS_LINUX) + // We want to destroy this here before the TestSuite continues to tear down // the environment. message_loop_.reset(); |