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

Unified Diff: net/test/run_all_unittests.cc

Issue 687833002: Get net_unittests working on Windows BoringSSL port. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wincrypt
Patch Set: fix gn Created 6 years, 2 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 | « net/ssl/openssl_client_key_store.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/test/run_all_unittests.cc
diff --git a/net/test/run_all_unittests.cc b/net/test/run_all_unittests.cc
index 12df717affb477a987dfff98e7c0a569921bb3a0..e86487e6fedf51c510db59fd6b9f44a21df4c405 100644
--- a/net/test/run_all_unittests.cc
+++ b/net/test/run_all_unittests.cc
@@ -52,7 +52,7 @@ int main(int argc, char** argv) {
NetTestSuite test_suite(argc, argv);
ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(false);
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_OPENSSL)
// We want to be sure to init NSPR on the main thread.
crypto::EnsureNSPRInit();
#endif
« no previous file with comments | « net/ssl/openssl_client_key_store.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698