summaryrefslogtreecommitdiffstats
path: root/chrome/common/net
diff options
context:
space:
mode:
authorjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-11 15:08:40 +0000
committerjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-11 15:08:40 +0000
commitbf37b1d8ba2b7308b2b356112e614f0dbe195dd0 (patch)
tree23a35d3e6e7212f7c3c12a6697e537b6e2b21b63 /chrome/common/net
parentf425f7c824b213f35cd3fb8f68defd10599c1325 (diff)
downloadchromium_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 'chrome/common/net')
-rw-r--r--chrome/common/net/url_fetcher_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/common/net/url_fetcher_unittest.cc b/chrome/common/net/url_fetcher_unittest.cc
index 466d8e6..65fb3c5 100644
--- a/chrome/common/net/url_fetcher_unittest.cc
+++ b/chrome/common/net/url_fetcher_unittest.cc
@@ -15,7 +15,7 @@
#include "net/test/test_server.h"
#include "testing/gtest/include/gtest/gtest.h"
-#if defined(OS_LINUX)
+#if defined(USE_NSS)
#include "net/ocsp/nss_ocsp.h"
#endif
@@ -79,13 +79,13 @@ 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)
+#if defined(USE_NSS)
net::EnsureOCSPInit();
#endif
}
virtual void TearDown() {
-#if defined(OS_LINUX)
+#if defined(USE_NSS)
net::ShutdownOCSP();
#endif
}