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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/quic/quic_crypto_server_stream_test.cc

Issue 218923002: Merge internal change: 63891842 - QuicServerId changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months 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
« net/base/host_port_pair.cc ('K') | « net/quic/quic_crypto_client_stream_test.cc ('k') | net/quic/quic_http_stream_test.cc » ('j') | net/quic/quic_server_id_test.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_crypto_server_stream_test.cc
diff --git a/net/quic/quic_crypto_server_stream_test.cc b/net/quic/quic_crypto_server_stream_test.cc
index d0c87e85f230d0d1e7837764a5a3e011aa25a609..65895834b3b4499b730a54bbfc6ba85be48a6462 100644
--- a/net/quic/quic_crypto_server_stream_test.cc
+++ b/net/quic/quic_crypto_server_stream_test.cc
@@ -145,10 +145,10 @@ TEST_P(QuicCryptoServerStreamTest, ZeroRTT) {
QuicCryptoClientConfig client_crypto_config;
client_crypto_config.SetDefaults();
- QuicSessionKey server_key(kServerHostname, kServerPort, false,
- kPrivacyModeDisabled);
+ QuicServerId server_id(kServerHostname, kServerPort, false,
+ kPrivacyModeDisabled);
scoped_ptr<QuicCryptoClientStream> client(new QuicCryptoClientStream(
- server_key, client_session.get(), NULL, &client_crypto_config));
+ server_id, client_session.get(), NULL, &client_crypto_config));
client_session->SetCryptoStream(client.get());
// Do a first handshake in order to prime the client config with the server's
@@ -182,7 +182,7 @@ TEST_P(QuicCryptoServerStreamTest, ZeroRTT) {
client_session.reset(new TestClientSession(client_conn, client_config));
server_session.reset(new TestClientSession(server_conn, config_));
client.reset(new QuicCryptoClientStream(
- server_key, client_session.get(), NULL, &client_crypto_config));
+ server_id, client_session.get(), NULL, &client_crypto_config));
client_session->SetCryptoStream(client.get());
server.reset(new QuicCryptoServerStream(crypto_config_,
« net/base/host_port_pair.cc ('K') | « net/quic/quic_crypto_client_stream_test.cc ('k') | net/quic/quic_http_stream_test.cc » ('j') | net/quic/quic_server_id_test.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698