| Index: webrtc/p2p/quic/quicsession_unittest.cc
|
| diff --git a/webrtc/p2p/quic/quicsession_unittest.cc b/webrtc/p2p/quic/quicsession_unittest.cc
|
| index 04b7d1ee7faa1b948844e2b8cf8d2df6ed4c89ca..cb696db8fccfc4c06cbf6b05e92c81e3816d91f7 100644
|
| --- a/webrtc/p2p/quic/quicsession_unittest.cc
|
| +++ b/webrtc/p2p/quic/quicsession_unittest.cc
|
| @@ -36,6 +36,7 @@ using net::ProofVerifyContext;
|
| using net::ProofVerifyDetails;
|
| using net::QuicByteCount;
|
| using net::QuicClock;
|
| +using net::QuicCompressedCertsCache;
|
| using net::QuicConfig;
|
| using net::QuicConnection;
|
| using net::QuicCryptoClientConfig;
|
| @@ -111,13 +112,16 @@ class FakeProofVerifier : public net::ProofVerifier {
|
| // ProofVerifier override
|
| net::QuicAsyncStatus VerifyProof(
|
| const std::string& hostname,
|
| + const uint16_t port,
|
| const std::string& server_config,
|
| + net::QuicVersion quic_version,
|
| + base::StringPiece chlo_hash,
|
| const std::vector<std::string>& certs,
|
| const std::string& cert_sct,
|
| const std::string& signature,
|
| - const net::ProofVerifyContext* verify_context,
|
| + const ProofVerifyContext* context,
|
| std::string* error_details,
|
| - scoped_ptr<net::ProofVerifyDetails>* verify_details,
|
| + std::unique_ptr<ProofVerifyDetails>* details,
|
| net::ProofVerifierCallback* callback) override {
|
| return success_ ? net::QUIC_SUCCESS : net::QUIC_FAILURE;
|
| }
|
| @@ -230,7 +234,10 @@ class QuicSessionForTest : public QuicSession {
|
| class QuicSessionTest : public ::testing::Test,
|
| public QuicCryptoClientStream::ProofHandler {
|
| public:
|
| - QuicSessionTest() : quic_helper_(rtc::Thread::Current()) {}
|
| + QuicSessionTest()
|
| + : quic_helper_(rtc::Thread::Current()),
|
| + quic_compressed_certs_cache_(
|
| + QuicCompressedCertsCache::kQuicCompressedCertsCacheSize) {}
|
|
|
| // Instantiates |client_peer_| and |server_peer_|.
|
| void CreateClientAndServerSessions();
|
| @@ -267,6 +274,7 @@ class QuicSessionTest : public ::testing::Test,
|
| QuicConnectionHelper quic_helper_;
|
| QuicConfig config_;
|
| QuicClock clock_;
|
| + QuicCompressedCertsCache quic_compressed_certs_cache_;
|
|
|
| rtc::scoped_ptr<QuicSessionForTest> client_peer_;
|
| rtc::scoped_ptr<QuicSessionForTest> server_peer_;
|
| @@ -323,7 +331,10 @@ QuicCryptoServerStream* QuicSessionTest::CreateCryptoServerStream(
|
| QuicServerConfigProtobuf* primary_config = server_config->GenerateConfig(
|
| QuicRandom::GetInstance(), &clock_, options);
|
| server_config->AddConfig(primary_config, clock_.WallNow());
|
| - return new QuicCryptoServerStream(server_config, session);
|
| + bool use_stateless_rejects_if_peer_supported = false;
|
| + return new QuicCryptoServerStream(
|
| + server_config, &quic_compressed_certs_cache_,
|
| + use_stateless_rejects_if_peer_supported, session);
|
| }
|
|
|
| rtc::scoped_ptr<QuicConnection> QuicSessionTest::CreateConnection(
|
| @@ -357,8 +368,8 @@ void QuicSessionTest::TestStreamConnection(QuicSessionForTest* from_session,
|
| ASSERT_TRUE(from_session->IsEncryptionEstablished());
|
| ASSERT_TRUE(to_session->IsEncryptionEstablished());
|
|
|
| - string from_key;
|
| - string to_key;
|
| + std::string from_key;
|
| + std::string to_key;
|
|
|
| bool from_success = from_session->ExportKeyingMaterial(
|
| kExporterLabel, kExporterContext, kExporterContextLen, &from_key);
|
|
|