Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Commit

Permalink
Restore main thread EnsureNSPRInit in the Linux ports.
Browse files Browse the repository at this point in the history
This got lost in the chimera on accident.

BUG=528468

Review URL: https://codereview.chromium.org/1332443002

Cr-Commit-Position: refs/heads/master@{#347573}
  • Loading branch information
davidben authored and Commit bot committed Sep 5, 2015
1 parent 1626ba4 commit 19d81eb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions content/browser/browser_main_loop.cc
Original file line number Diff line number Diff line change
Expand Up @@ -469,10 +469,10 @@ void BrowserMainLoop::EarlyInitialization() {
net::EnsureWinsockInit();
#endif

#if !defined(USE_OPENSSL)
#if defined(USE_NSS_CERTS)
// We want to be sure to init NSPR on the main thread.
crypto::EnsureNSPRInit();
#endif // !defined(USE_OPENSSL)
#endif // defined(USE_NSS_CERTS)

#if !defined(OS_IOS)
if (parsed_command_line_.HasSwitch(switches::kRendererProcessLimit)) {
Expand Down

0 comments on commit 19d81eb

Please sign in to comment.