Chromium Code Reviews| Index: net/quic/quic_client_session.cc |
| diff --git a/net/quic/quic_client_session.cc b/net/quic/quic_client_session.cc |
| index 3ec2c89adfe049e773ee539dc53ff9dd221893c3..66d10366a63540ea373d7269888e2eb1f1154264 100644 |
| --- a/net/quic/quic_client_session.cc |
| +++ b/net/quic/quic_client_session.cc |
| @@ -16,6 +16,7 @@ |
| #include "net/quic/quic_connection_helper.h" |
| #include "net/quic/quic_crypto_client_stream_factory.h" |
| #include "net/quic/quic_default_packet_writer.h" |
| +#include "net/quic/quic_session_key.h" |
| #include "net/quic/quic_stream_factory.h" |
| #include "net/ssl/ssl_info.h" |
| #include "net/udp/datagram_client_socket.h" |
| @@ -86,7 +87,7 @@ QuicClientSession::QuicClientSession( |
| scoped_ptr<QuicDefaultPacketWriter> writer, |
| QuicStreamFactory* stream_factory, |
| QuicCryptoClientStreamFactory* crypto_client_stream_factory, |
| - const string& server_hostname, |
| + const QuicSessionKey& session_key, |
| const QuicConfig& config, |
| QuicCryptoClientConfig* crypto_config, |
| NetLog* net_log) |
| @@ -105,14 +106,15 @@ QuicClientSession::QuicClientSession( |
| crypto_stream_.reset( |
| crypto_client_stream_factory ? |
| crypto_client_stream_factory->CreateQuicCryptoClientStream( |
| - server_hostname, this, crypto_config) : |
| - new QuicCryptoClientStream(server_hostname, this, crypto_config)); |
| + session_key, this, crypto_config) : |
| + new QuicCryptoClientStream( |
| + session_key, this, crypto_config)); |
| connection->set_debug_visitor(&logger_); |
| // TODO(rch): pass in full host port proxy pair |
| net_log_.BeginEvent( |
| NetLog::TYPE_QUIC_SESSION, |
| - NetLog::StringCallback("host", &server_hostname)); |
| + NetLog::StringCallback("host", &session_key.host_port_pair().host())); |
|
wtc
2014/03/13 22:22:03
Nit: perhaps QuicSessionKey should provide a host(
ramant (doing other things)
2014/03/13 23:46:36
Done.
|
| } |
| QuicClientSession::~QuicClientSession() { |