| 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 5bcbc70350714aabb7ed98580387bd742077ede8..950c032e7159d5875bdb90a58b8dad0ba412fd56 100644
|
| --- a/net/quic/crypto/crypto_server_test.cc
|
| +++ b/net/quic/crypto/crypto_server_test.cc
|
| @@ -93,13 +93,9 @@ class CryptoServerTest : public ::testing::TestWithParam<TestParams> {
|
| public:
|
| CryptoServerTest()
|
| : rand_(QuicRandom::GetInstance()),
|
| - client_address_(Loopback4(), 1234),
|
| - config_(QuicCryptoServerConfig::TESTING, rand_) {
|
| -#if defined(USE_OPENSSL)
|
| - config_.SetProofSource(CryptoTestUtils::ProofSourceForTesting());
|
| -#else
|
| - config_.SetProofSource(CryptoTestUtils::FakeProofSourceForTesting());
|
| -#endif
|
| + client_address_(IPEndPoint(Loopback4(), 1234)),
|
| + config_(QuicCryptoServerConfig::TESTING, rand_,
|
| + CryptoTestUtils::ProofSourceForTesting()) {
|
| supported_versions_ = QuicSupportedVersions();
|
| client_version_ = supported_versions_.front();
|
| client_version_string_ =
|
| @@ -763,8 +759,10 @@ TEST(CryptoServerConfigGenerationTest, Determinism) {
|
| const QuicCryptoServerConfig::ConfigOptions options;
|
| MockClock clock;
|
|
|
| - QuicCryptoServerConfig a(QuicCryptoServerConfig::TESTING, &rand_a);
|
| - QuicCryptoServerConfig b(QuicCryptoServerConfig::TESTING, &rand_b);
|
| + QuicCryptoServerConfig a(QuicCryptoServerConfig::TESTING, &rand_a,
|
| + CryptoTestUtils::ProofSourceForTesting());
|
| + QuicCryptoServerConfig b(QuicCryptoServerConfig::TESTING, &rand_b,
|
| + CryptoTestUtils::ProofSourceForTesting());
|
| scoped_ptr<CryptoHandshakeMessage> scfg_a(
|
| a.AddDefaultConfig(&rand_a, &clock, options));
|
| scoped_ptr<CryptoHandshakeMessage> scfg_b(
|
| @@ -781,9 +779,11 @@ TEST(CryptoServerConfigGenerationTest, SCIDVaries) {
|
| const QuicCryptoServerConfig::ConfigOptions options;
|
| MockClock clock;
|
|
|
| - QuicCryptoServerConfig a(QuicCryptoServerConfig::TESTING, &rand_a);
|
| + QuicCryptoServerConfig a(QuicCryptoServerConfig::TESTING, &rand_a,
|
| + CryptoTestUtils::ProofSourceForTesting());
|
| rand_b.ChangeValue();
|
| - QuicCryptoServerConfig b(QuicCryptoServerConfig::TESTING, &rand_b);
|
| + QuicCryptoServerConfig b(QuicCryptoServerConfig::TESTING, &rand_b,
|
| + CryptoTestUtils::ProofSourceForTesting());
|
| scoped_ptr<CryptoHandshakeMessage> scfg_a(
|
| a.AddDefaultConfig(&rand_a, &clock, options));
|
| scoped_ptr<CryptoHandshakeMessage> scfg_b(
|
| @@ -801,7 +801,8 @@ TEST(CryptoServerConfigGenerationTest, SCIDIsHashOfServerConfig) {
|
| const QuicCryptoServerConfig::ConfigOptions options;
|
| MockClock clock;
|
|
|
| - QuicCryptoServerConfig a(QuicCryptoServerConfig::TESTING, &rand_a);
|
| + QuicCryptoServerConfig a(QuicCryptoServerConfig::TESTING, &rand_a,
|
| + CryptoTestUtils::ProofSourceForTesting());
|
| scoped_ptr<CryptoHandshakeMessage> scfg(
|
| a.AddDefaultConfig(&rand_a, &clock, options));
|
|
|
|
|