diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-28 00:32:10 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-28 00:32:10 +0000 |
| commit | c2a4c3d9954148e090332e29a2d88f64dffe9a3a (patch) | |
| tree | 6b2449ec85d35e7ac9aab8c539536c8199c473e7 /base | |
| parent | e09cfd8679ef12b16e17a1d246a1057d24c6132c (diff) | |
| download | chromium_src-c2a4c3d9954148e090332e29a2d88f64dffe9a3a.zip chromium_src-c2a4c3d9954148e090332e29a2d88f64dffe9a3a.tar.gz chromium_src-c2a4c3d9954148e090332e29a2d88f64dffe9a3a.tar.bz2 | |
Use the USE_NSS macro to help porting to FreeBSD, OpenBSD, etc.
Fix cpplint nits.
R=evan,pvalchev
BUG=none
TEST=No compilation errors.
Review URL: http://codereview.chromium.org/558008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37358 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/test/test_suite.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/test/test_suite.h b/base/test/test_suite.h index 2c491c2..94e7b1a 100644 --- a/base/test/test_suite.h +++ b/base/test/test_suite.h @@ -212,13 +212,13 @@ class TestSuite { icu_util::Initialize(); -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(USE_NSS) // Trying to repeatedly initialize and cleanup NSS and NSPR may result in // a deadlock. Such repeated initialization will happen when using test // isolation. Prevent problems by initializing NSS here, so that the cleanup // will be done only on process exit. base::EnsureNSSInit(); -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) +#endif // defined(USE_NSS) } virtual void Shutdown() { |