content/browser/browser_main_loop.cc - Issue 1882433002: Removing NSS files and USE_OPENSSL flag

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: 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: Rebase. 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:

Index: content/browser/browser_main_loop.cc

diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc

index d04fac6b147339f10bde310815d836b2b5f3f53a..d36ad98996496a25dad5f3bda1ef0a0484c97caa 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" // nogncheck

#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

« no previous file with comments | « components/variations/variations_seed_store_unittest.cc ('k') | content/test/BUILD.gn » ('j') | no next file with comments »