net/test/run_all_unittests.cc - Issue 683113005: Update from chromium https://crrev.com/302282

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/test/run_all_unittests.cc

Issue 683113005: Update from chromium https://crrev.com/302282 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: 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:

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