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

Unified Diff: net/quic/test_tools/crypto_test_utils.cc

Issue 2463093003: Landing Recent QUIC changes until Sat Oct 29 14:59:35. (Closed)
Patch Set: add change to quiartc_session_test.cc Created 4 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/test_tools/crypto_test_utils.h ('k') | net/quic/test_tools/crypto_test_utils_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/test_tools/crypto_test_utils.cc
diff --git a/net/quic/test_tools/crypto_test_utils.cc b/net/quic/test_tools/crypto_test_utils.cc
index b0d1b9234796e46c28913a9b30a33b4e27e54dd4..adb68bd22aede52197125c8b902bd405def892d3 100644
--- a/net/quic/test_tools/crypto_test_utils.cc
+++ b/net/quic/test_tools/crypto_test_utils.cc
@@ -330,7 +330,8 @@ class FullChloGenerator {
QuicErrorCode error,
const string& error_details,
std::unique_ptr<CryptoHandshakeMessage> message,
- std::unique_ptr<DiversificationNonce> diversification_nonce) override {
+ std::unique_ptr<DiversificationNonce> diversification_nonce,
+ std::unique_ptr<ProofSource::Details> proof_source_details) override {
generator_->ProcessClientHelloDone(std::move(message));
}
@@ -401,7 +402,7 @@ int CryptoTestUtils::HandshakeWithFakeServer(
QuicCompressedCertsCache::kQuicCompressedCertsCacheSize);
SetupCryptoServerConfigForTest(server_conn->clock(),
server_conn->random_generator(),
- server_quic_config, &crypto_config, options);
+ &crypto_config, options);
TestQuicSpdyServerSession server_session(server_conn, *server_quic_config,
&crypto_config,
@@ -479,7 +480,6 @@ int CryptoTestUtils::HandshakeWithFakeClient(
void CryptoTestUtils::SetupCryptoServerConfigForTest(
const QuicClock* clock,
QuicRandom* rand,
- QuicConfig* config,
QuicCryptoServerConfig* crypto_config,
const FakeServerOptions& fake_options) {
QuicCryptoServerConfig::ConfigOptions options;
@@ -572,7 +572,7 @@ uint64_t CryptoTestUtils::LeafCertHashForTesting() {
std::unique_ptr<ProofSource> proof_source(
CryptoTestUtils::ProofSourceForTesting());
if (!proof_source->GetProof(server_ip, "", "", AllSupportedVersions().front(),
- "", &chain, &sig, &cert_sct) ||
+ "", QuicTagVector(), &chain, &sig, &cert_sct) ||
chain->certs.empty()) {
DCHECK(false) << "Proof generation failed";
return 0;
« no previous file with comments | « net/quic/test_tools/crypto_test_utils.h ('k') | net/quic/test_tools/crypto_test_utils_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698