Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3302)

Unified Diff: base/test/test_suite.cc

Issue 6805019: Move crypto files out of base, to a top level directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fixes comments by eroman Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/sha2_unittest.cc ('k') | base/third_party/nss/LICENSE » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/test/test_suite.cc
===================================================================
--- base/test/test_suite.cc (revision 81350)
+++ base/test/test_suite.cc (working copy)
@@ -15,7 +15,6 @@
#include "base/logging.h"
#include "base/mac/scoped_nsautorelease_pool.h"
#include "base/memory/scoped_ptr.h"
-#include "base/nss_util.h"
#include "base/path_service.h"
#include "base/process_util.h"
#include "base/test/multiprocess_test.h"
@@ -214,14 +213,6 @@
icu_util::Initialize();
-#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(USE_NSS)
-
CatchMaybeTests();
TestTimeouts::Initialize();
« no previous file with comments | « base/sha2_unittest.cc ('k') | base/third_party/nss/LICENSE » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698