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 /chrome/common/net | |
| 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 'chrome/common/net')
| -rw-r--r-- | chrome/common/net/url_fetcher_unittest.cc | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/chrome/common/net/url_fetcher_unittest.cc b/chrome/common/net/url_fetcher_unittest.cc index 7bf29c7..466d8e6 100644 --- a/chrome/common/net/url_fetcher_unittest.cc +++ b/chrome/common/net/url_fetcher_unittest.cc @@ -5,6 +5,7 @@ #include "base/message_loop_proxy.h" #include "base/thread.h" #include "base/waitable_event.h" +#include "build/build_config.h" #include "chrome/common/chrome_plugin_lib.h" #include "chrome/common/net/url_fetcher.h" #include "chrome/common/net/url_fetcher_protect.h" @@ -14,6 +15,10 @@ #include "net/test/test_server.h" #include "testing/gtest/include/gtest/gtest.h" +#if defined(OS_LINUX) +#include "net/ocsp/nss_ocsp.h" +#endif + using base::Time; using base::TimeDelta; @@ -74,6 +79,15 @@ class URLFetcherTest : public testing::Test, public URLFetcher::Delegate { // Ensure that any plugin operations done by other tests are cleaned up. ChromePluginLib::UnloadAllPlugins(); +#if defined(OS_LINUX) + net::EnsureOCSPInit(); +#endif + } + + virtual void TearDown() { +#if defined(OS_LINUX) + net::ShutdownOCSP(); +#endif } // URLFetcher is designed to run on the main UI thread, but in our tests |