diff options
| author | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-03 02:06:43 +0000 |
|---|---|---|
| committer | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-03 02:06:43 +0000 |
| commit | 575cce6c6b8ce8f5c2dff9dc9ad51a7f302765a1 (patch) | |
| tree | 1924938680cb7c579e47fb77f9f6d3c371708325 /net/quic/quic_connection_helper_test.cc | |
| parent | 36e151a64e36f7f5f491e74995f402ef69e9e81c (diff) | |
| download | chromium_src-575cce6c6b8ce8f5c2dff9dc9ad51a7f302765a1.zip chromium_src-575cce6c6b8ce8f5c2dff9dc9ad51a7f302765a1.tar.gz chromium_src-575cce6c6b8ce8f5c2dff9dc9ad51a7f302765a1.tar.bz2 | |
Tell congestion manager when we are sending a CHLO, so it won't delay sending.
Most critically, we need to ignore the congestion window when we're sending
a CHLO. Such packets are notable as they are the only packets send with null
encryption (other than perhaps ACKs, which are generally not restricted anyway).
BUG=266647
Review URL: https://chromiumcodereview.appspot.com/21714002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215455 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/quic/quic_connection_helper_test.cc')
| -rw-r--r-- | net/quic/quic_connection_helper_test.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/quic/quic_connection_helper_test.cc b/net/quic/quic_connection_helper_test.cc index 21ff95b..a955e4c5 100644 --- a/net/quic/quic_connection_helper_test.cc +++ b/net/quic/quic_connection_helper_test.cc @@ -104,7 +104,7 @@ class QuicConnectionHelperTest : public ::testing::Test { helper_ = new QuicConnectionHelper(runner_.get(), &clock_, &random_generator_, socket_.get()); send_algorithm_ = new testing::StrictMock<MockSendAlgorithm>(); - EXPECT_CALL(*send_algorithm_, TimeUntilSend(_, _, _)). + EXPECT_CALL(*send_algorithm_, TimeUntilSend(_, _, _, _)). WillRepeatedly(testing::Return(QuicTime::Delta::Zero())); connection_.reset(new TestConnection(guid_, IPEndPoint(), helper_)); connection_->set_visitor(&visitor_); @@ -451,7 +451,7 @@ TEST_F(QuicConnectionHelperTest, SendSchedulerDelayThenSend) { EXPECT_CALL(*send_algorithm_, RetransmissionDelay()).WillRepeatedly( testing::Return(QuicTime::Delta::Zero())); EXPECT_CALL( - *send_algorithm_, TimeUntilSend(_, NOT_RETRANSMISSION, _)).WillOnce( + *send_algorithm_, TimeUntilSend(_, NOT_RETRANSMISSION, _, _)).WillOnce( testing::Return(QuicTime::Delta::FromMicroseconds(1))); QuicPacket* packet = ConstructRawDataPacket(1); @@ -462,9 +462,9 @@ TEST_F(QuicConnectionHelperTest, SendSchedulerDelayThenSend) { // Advance the clock to fire the alarm, and configure the scheduler // to permit the packet to be sent. - EXPECT_CALL( - *send_algorithm_, TimeUntilSend(_, NOT_RETRANSMISSION, _)).WillRepeatedly( - testing::Return(QuicTime::Delta::Zero())); + EXPECT_CALL(*send_algorithm_, + TimeUntilSend(_, NOT_RETRANSMISSION, _, _)).WillRepeatedly( + testing::Return(QuicTime::Delta::Zero())); EXPECT_CALL(visitor_, OnCanWrite()).WillOnce(testing::Return(true)); runner_->RunNextTask(); EXPECT_EQ(0u, connection_->NumQueuedPackets()); |