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

Unified Diff: net/quic/crypto/quic_crypto_server_config_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 | « net/quic/crypto/proof_test.cc ('k') | net/quic/quic_chromium_client_session_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/crypto/quic_crypto_server_config_test.cc
diff --git a/net/quic/crypto/quic_crypto_server_config_test.cc b/net/quic/crypto/quic_crypto_server_config_test.cc
index fa43b739341102081a65214d6104811933071beb..21c338d94d46d19607daa2a30f7bc5239a782567 100644
--- a/net/quic/crypto/quic_crypto_server_config_test.cc
+++ b/net/quic/crypto/quic_crypto_server_config_test.cc
@@ -220,11 +220,7 @@ class TestStrikeRegisterClient : public StrikeRegisterClient {
TEST(QuicCryptoServerConfigTest, ServerConfig) {
QuicRandom* rand = QuicRandom::GetInstance();
QuicCryptoServerConfig server(QuicCryptoServerConfig::TESTING, rand,
-#if defined(USE_OPENSSL)
CryptoTestUtils::ProofSourceForTesting());
-#else
- CryptoTestUtils::FakeProofSourceForTesting());
-#endif
MockClock clock;
scoped_ptr<CryptoHandshakeMessage>(
@@ -235,11 +231,7 @@ TEST(QuicCryptoServerConfigTest, ServerConfig) {
TEST(QuicCryptoServerConfigTest, GetOrbitIsCalledWithoutTheStrikeRegisterLock) {
QuicRandom* rand = QuicRandom::GetInstance();
QuicCryptoServerConfig server(QuicCryptoServerConfig::TESTING, rand,
-#if defined(USE_OPENSSL)
CryptoTestUtils::ProofSourceForTesting());
-#else
- CryptoTestUtils::FakeProofSourceForTesting());
-#endif
MockClock clock;
TestStrikeRegisterClient* strike_register =
@@ -262,11 +254,7 @@ class SourceAddressTokenTest : public ::testing::Test {
rand_(QuicRandom::GetInstance()),
server_(QuicCryptoServerConfig::TESTING,
rand_,
-#if defined(USE_OPENSSL)
CryptoTestUtils::ProofSourceForTesting()),
-#else
- CryptoTestUtils::FakeProofSourceForTesting()),
-#endif
peer_(&server_) {
// Advance the clock to some non-zero time.
clock_.AdvanceTime(QuicTime::Delta::FromSeconds(1000000));
@@ -440,11 +428,7 @@ TEST_F(SourceAddressTokenTest, SourceAddressTokenMultipleAddresses) {
TEST(QuicCryptoServerConfigTest, ValidateServerNonce) {
QuicRandom* rand = QuicRandom::GetInstance();
QuicCryptoServerConfig server(QuicCryptoServerConfig::TESTING, rand,
-#if defined(USE_OPENSSL)
CryptoTestUtils::ProofSourceForTesting());
-#else
- CryptoTestUtils::FakeProofSourceForTesting());
-#endif
QuicCryptoServerConfigPeer peer(&server);
StringPiece message("hello world");
@@ -477,11 +461,7 @@ class CryptoServerConfigsTest : public ::testing::Test {
: rand_(QuicRandom::GetInstance()),
config_(QuicCryptoServerConfig::TESTING,
rand_,
-#if defined(USE_OPENSSL)
CryptoTestUtils::ProofSourceForTesting()),
-#else
- CryptoTestUtils::FakeProofSourceForTesting()),
-#endif
test_peer_(&config_) {
}
« no previous file with comments | « net/quic/crypto/proof_test.cc ('k') | net/quic/quic_chromium_client_session_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698