net/test/test_server.h - Issue 5195001: Fixes the remaining net_unittests for OpenSSL, with the exceptions

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/test_server.h

Issue 5195001: Fixes the remaining net_unittests for OpenSSL, with the exceptions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Clarify comment Created 10 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: net/test/test_server.h

diff --git a/net/test/test_server.h b/net/test/test_server.h

index 00a8fc950e45b7f3c071506a586039a3931b2697..1ae0a50867b5de02fcff02d16a022b542a3d30be 100644

--- a/net/test/test_server.h

+++ b/net/test/test_server.h

@@ -22,7 +22,7 @@

#include "base/scoped_handle_win.h"

#endif

-#if defined(USE_NSS)

+#if defined(USE_OPENSSL) || defined(USE_NSS)

#include "base/ref_counted.h"

#include "net/base/x509_certificate.h"

#endif

@@ -200,7 +200,7 @@ class TestServer {

// If |type_| is TYPE_HTTPS, the TLS settings to use for the test server.

HTTPSOptions https_options_;

-#if defined(USE_NSS)

+#if defined(USE_OPENSSL) || defined(USE_NSS)

scoped_refptr<X509Certificate> cert_;

#endif