summaryrefslogtreecommitdiffstats
path: root/net/quic/quic_crypto_server_stream_test.cc
diff options
context:
space:
mode:
authorrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-17 07:58:54 +0000
committerrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-17 07:58:54 +0000
commit47a7154b760679fb3582ec924e0cc3c25bcc316a (patch)
treecbf3b9a6e88606d691ac5834e9446af1ed2f63a3 /net/quic/quic_crypto_server_stream_test.cc
parent6867139cd27b559d0c89f6cd3e06e31cb306b9db (diff)
downloadchromium_src-47a7154b760679fb3582ec924e0cc3c25bcc316a.zip
chromium_src-47a7154b760679fb3582ec924e0cc3c25bcc316a.tar.gz
chromium_src-47a7154b760679fb3582ec924e0cc3c25bcc316a.tar.bz2
QUIC - Moved call to SetDefaults to callers of QuicClientSession.
Merged internal changes: 46739143 R=wtc@chromium.org Review URL: https://chromiumcodereview.appspot.com/14795017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200746 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/quic/quic_crypto_server_stream_test.cc')
-rw-r--r--net/quic/quic_crypto_server_stream_test.cc6
1 files changed, 2 insertions, 4 deletions
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());