Restore main thread EnsureNSPRInit in the Linux ports.

This got lost in the chimera on accident. BUG=528468 Review URL: https://codereview.chromium.org/1332443002 Cr-Commit-Position: refs/heads/master@{#347573} (cherry picked from commit 19d81eb) This also merges in https://codereview.chromium.org/1328253002 which was a mistake in the original CL. [email protected] Review URL: https://codereview.chromium.org/1326773005 . Cr-Commit-Position: refs/branch-heads/2490@{#191} Cr-Branched-From: 7790a35-refs/heads/master@{#344925}
crosswalk-project · Sep 8, 2015 · ecc1246 · ecc1246
1 parent ee6b913
commit ecc1246
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
@@ -465,10 +465,10 @@ void BrowserMainLoop::EarlyInitialization() {
   net::EnsureWinsockInit();
 #endif
 
-#if !defined(USE_OPENSSL)
+#if defined(USE_NSS_CERTS) || !defined(USE_OPENSSL)
   // We want to be sure to init NSPR on the main thread.
   crypto::EnsureNSPRInit();
-#endif  // !defined(USE_OPENSSL)
+#endif
 
 #if !defined(OS_IOS)
   if (parsed_command_line_.HasSwitch(switches::kRendererProcessLimit)) {