diff options
| -rw-r--r-- | net/quic/quic_client_session.cc | 1 | ||||
| -rw-r--r-- | net/quic/quic_client_session_test.cc | 1 | ||||
| -rw-r--r-- | net/quic/quic_crypto_server_stream_test.cc | 6 | ||||
| -rw-r--r-- | net/quic/quic_http_stream_test.cc | 1 | ||||
| -rw-r--r-- | net/quic/quic_stream_factory.cc | 1 |
5 files changed, 5 insertions, 5 deletions
diff --git a/net/quic/quic_client_session.cc b/net/quic/quic_client_session.cc index 796fef6..5a993e6 100644 --- a/net/quic/quic_client_session.cc +++ b/net/quic/quic_client_session.cc @@ -36,7 +36,6 @@ QuicClientSession::QuicClientSession( num_total_streams_(0), net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_QUIC_SESSION)), logger_(net_log_) { - QuicSession::config()->SetDefaults(); crypto_stream_.reset( crypto_client_stream_factory ? crypto_client_stream_factory->CreateQuicCryptoClientStream( diff --git a/net/quic/quic_client_session_test.cc b/net/quic/quic_client_session_test.cc index cab44a7..591da0a 100644 --- a/net/quic/quic_client_session_test.cc +++ b/net/quic/quic_client_session_test.cc @@ -31,6 +31,7 @@ class QuicClientSessionTest : public ::testing::Test { connection_(new PacketSavingConnection(guid_, IPEndPoint(), false)), session_(connection_, NULL, NULL, NULL, kServerHostname, QuicConfig(), &crypto_config_, &net_log_) { + session_.config()->SetDefaults(); crypto_config_.SetDefaults(); QuicClientSessionPeer::SetMaxOpenStreams(&session_, 1, 1); } diff --git a/net/quic/quic_crypto_server_stream_test.cc b/net/quic/quic_crypto_server_stream_test.cc index 73469db..686bca7 100644 --- a/net/quic/quic_crypto_server_stream_test.cc +++ b/net/quic/quic_crypto_server_stream_test.cc @@ -64,6 +64,7 @@ class QuicCryptoServerStreamTest : public ::testing::Test { session_(connection_, QuicConfig(), true), crypto_config_(QuicCryptoServerConfig::TESTING), stream_(crypto_config_, &session_) { + config_.SetDefaults(); session_.config()->SetDefaults(); session_.SetCryptoStream(&stream_); // We advance the clock initially because the default time is zero and the @@ -148,9 +149,9 @@ TEST_F(QuicCryptoServerStreamTest, ZeroRTT) { server_conn->AdvanceTime(QuicTime::Delta::FromSeconds(100000)); QuicConfig client_config; + client_config.SetDefaults(); scoped_ptr<TestSession> client_session( new TestSession(client_conn, client_config, false)); - client_session->config()->SetDefaults(); QuicCryptoClientConfig client_crypto_config; client_crypto_config.SetDefaults(); @@ -165,7 +166,6 @@ TEST_F(QuicCryptoServerStreamTest, ZeroRTT) { scoped_ptr<TestSession> server_session( new TestSession(server_conn, config_, true)); - server_session->config()->SetDefaults(); scoped_ptr<QuicCryptoServerStream> server( new QuicCryptoServerStream(crypto_config_, server_session.get())); server_session->SetCryptoStream(server.get()); @@ -188,9 +188,7 @@ TEST_F(QuicCryptoServerStreamTest, ZeroRTT) { // strike-register from rejecting the repeated nonce. client_conn->random_generator()->Reseed(NULL, 0); client_session.reset(new TestSession(client_conn, client_config, false)); - client_session->config()->SetDefaults(); server_session.reset(new TestSession(server_conn, config_, true)); - server_session->config()->SetDefaults(); client.reset(new QuicCryptoClientStream( "test.example.com", client_session.get(), &client_crypto_config)); client_session->SetCryptoStream(client.get()); diff --git a/net/quic/quic_http_stream_test.cc b/net/quic/quic_http_stream_test.cc index 1c10cdb..cf8b235 100644 --- a/net/quic/quic_http_stream_test.cc +++ b/net/quic/quic_http_stream_test.cc @@ -181,6 +181,7 @@ class QuicHttpStreamTest : public ::testing::TestWithParam<bool> { &crypto_client_stream_factory_, "www.google.com", QuicConfig(), &crypto_config_, NULL)); + session_->config()->SetDefaults(); session_->GetCryptoStream()->CryptoConnect(); EXPECT_TRUE(session_->IsCryptoHandshakeConfirmed()); QuicReliableClientStream* stream = diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc index 007fc88..ee4fa62 100644 --- a/net/quic/quic_stream_factory.cc +++ b/net/quic/quic_stream_factory.cc @@ -388,6 +388,7 @@ QuicClientSession* QuicStreamFactory::CreateSession( quic_crypto_client_stream_factory_, host_port_proxy_pair.first.host(), QuicConfig(), crypto_config, net_log.net_log()); + session->config()->SetDefaults(); all_sessions_.insert(session); // owning pointer return session; } |