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

Unified Diff: net/quic/crypto/crypto_server_test.cc

Issue 1415933006: QUIC - delete #ifdef USE_OPENSSL in unittests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix comments Created 5 years, 1 month 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
« no previous file with comments | « no previous file | net/quic/crypto/proof_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/crypto/crypto_server_test.cc
diff --git a/net/quic/crypto/crypto_server_test.cc b/net/quic/crypto/crypto_server_test.cc
index 427c1cf99573f69bec67839984858844860a441a..ee687df0722c2faca2a76a3e8b3e2df9d95c3d8d 100644
--- a/net/quic/crypto/crypto_server_test.cc
+++ b/net/quic/crypto/crypto_server_test.cc
@@ -109,11 +109,7 @@ class CryptoServerTest : public ::testing::TestWithParam<TestParams> {
client_address_(Loopback4(), 1234),
config_(QuicCryptoServerConfig::TESTING,
rand_,
-#if defined(USE_OPENSSL)
CryptoTestUtils::ProofSourceForTesting()) {
-#else
- CryptoTestUtils::FakeProofSourceForTesting()) {
-#endif
supported_versions_ = GetParam().supported_versions;
config_.set_enable_serving_sct(true);
@@ -352,13 +348,8 @@ class CryptoServerTest : public ::testing::TestWithParam<TestParams> {
IPAddressNumber server_ip;
string sig;
string cert_sct;
-#if defined(USE_OPENSSL)
scoped_ptr<ProofSource> proof_source(
CryptoTestUtils::ProofSourceForTesting());
-#else
- scoped_ptr<ProofSource> proof_source(
- CryptoTestUtils::FakeProofSourceForTesting());
-#endif
if (!proof_source->GetProof(server_ip, "", "", false, &certs, &sig,
&cert_sct) ||
certs->empty()) {
@@ -784,17 +775,9 @@ TEST(CryptoServerConfigGenerationTest, Determinism) {
MockClock clock;
QuicCryptoServerConfig a(QuicCryptoServerConfig::TESTING, &rand_a,
-#if defined(USE_OPENSSL)
CryptoTestUtils::ProofSourceForTesting());
-#else
- CryptoTestUtils::FakeProofSourceForTesting());
-#endif
QuicCryptoServerConfig b(QuicCryptoServerConfig::TESTING, &rand_b,
-#if defined(USE_OPENSSL)
CryptoTestUtils::ProofSourceForTesting());
-#else
- CryptoTestUtils::FakeProofSourceForTesting());
-#endif
scoped_ptr<CryptoHandshakeMessage> scfg_a(
a.AddDefaultConfig(&rand_a, &clock, options));
scoped_ptr<CryptoHandshakeMessage> scfg_b(
@@ -812,18 +795,10 @@ TEST(CryptoServerConfigGenerationTest, SCIDVaries) {
MockClock clock;
QuicCryptoServerConfig a(QuicCryptoServerConfig::TESTING, &rand_a,
-#if defined(USE_OPENSSL)
CryptoTestUtils::ProofSourceForTesting());
-#else
- CryptoTestUtils::FakeProofSourceForTesting());
-#endif
rand_b.ChangeValue();
QuicCryptoServerConfig b(QuicCryptoServerConfig::TESTING, &rand_b,
-#if defined(USE_OPENSSL)
CryptoTestUtils::ProofSourceForTesting());
-#else
- CryptoTestUtils::FakeProofSourceForTesting());
-#endif
scoped_ptr<CryptoHandshakeMessage> scfg_a(
a.AddDefaultConfig(&rand_a, &clock, options));
scoped_ptr<CryptoHandshakeMessage> scfg_b(
@@ -842,11 +817,7 @@ TEST(CryptoServerConfigGenerationTest, SCIDIsHashOfServerConfig) {
MockClock clock;
QuicCryptoServerConfig a(QuicCryptoServerConfig::TESTING, &rand_a,
-#if defined(USE_OPENSSL)
CryptoTestUtils::ProofSourceForTesting());
-#else
- CryptoTestUtils::FakeProofSourceForTesting());
-#endif
scoped_ptr<CryptoHandshakeMessage> scfg(
a.AddDefaultConfig(&rand_a, &clock, options));
« no previous file with comments | « no previous file | net/quic/crypto/proof_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698