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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/browser_main_loop.cc

Issue 1882433002: Removing NSS files and USE_OPENSSL flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing header ordering. Created 4 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
« build/linux/system.gyp ('K') | « components/variations/variations_seed_store_unittest.cc ('k') | content/test/BUILD.gn » ('j') | crypto/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 5c449e5b209f76b411aac4b6decb386bc84f5d7d..108c2733a54b0c02fd5e8099fd26d7823424bccb 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -176,7 +176,7 @@
#include "ui/gfx/x/x11_types.h"
#endif
-#if defined(USE_NSS_CERTS) || !defined(USE_OPENSSL)
+#if defined(USE_NSS_CERTS)
#include "crypto/nss_util.h"
#endif
@@ -495,7 +495,7 @@ void BrowserMainLoop::EarlyInitialization() {
net::EnsureWinsockInit();
#endif
-#if defined(USE_NSS_CERTS) || !defined(USE_OPENSSL)
+#if defined(USE_NSS_CERTS)
// We want to be sure to init NSPR on the main thread.
crypto::EnsureNSPRInit();
#endif
« build/linux/system.gyp ('K') | « components/variations/variations_seed_store_unittest.cc ('k') | content/test/BUILD.gn » ('j') | crypto/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698