diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-11 15:08:40 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-11 15:08:40 +0000 |
| commit | bf37b1d8ba2b7308b2b356112e614f0dbe195dd0 (patch) | |
| tree | 23a35d3e6e7212f7c3c12a6697e537b6e2b21b63 /net/base/net_test_suite.h | |
| parent | f425f7c824b213f35cd3fb8f68defd10599c1325 (diff) | |
| download | chromium_src-bf37b1d8ba2b7308b2b356112e614f0dbe195dd0.zip chromium_src-bf37b1d8ba2b7308b2b356112e614f0dbe195dd0.tar.gz chromium_src-bf37b1d8ba2b7308b2b356112e614f0dbe195dd0.tar.bz2 | |
openssl build fixes, and tidy the build files
Split out of http://codereview.chromium.org/4691003/
BUG=None
TEST=builds...
Review URL: http://codereview.chromium.org/4696004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65801 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/net_test_suite.h')
| -rw-r--r-- | net/base/net_test_suite.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/base/net_test_suite.h b/net/base/net_test_suite.h index 00d9844..8ebc4e7 100644 --- a/net/base/net_test_suite.h +++ b/net/base/net_test_suite.h @@ -11,7 +11,9 @@ #include "base/test/test_suite.h" #include "build/build_config.h" #include "net/base/mock_host_resolver.h" +#if defined(USE_NSS) #include "net/ocsp/nss_ocsp.h" +#endif class NetTestSuite : public base::TestSuite { public: @@ -41,9 +43,9 @@ class NetTestSuite : public base::TestSuite { } virtual void Shutdown() { -#if defined(OS_LINUX) +#if defined(USE_NSS) net::ShutdownOCSP(); -#endif // defined(OS_LINUX) +#endif // We want to destroy this here before the TestSuite continues to tear down // the environment. |