diff options
| author | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-19 10:52:04 +0000 |
|---|---|---|
| committer | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-19 10:52:04 +0000 |
| commit | 691f45a982c0d5712311602ffff746a0e631e63f (patch) | |
| tree | 558b690f1a5b816e2e63d7c5f005f55a6c0aa17b /net/tools/quic/quic_server_test.cc | |
| parent | be06dec5b64b67d6f40dd7b58f18d376a16f442c (diff) | |
| download | chromium_src-691f45a982c0d5712311602ffff746a0e631e63f.zip chromium_src-691f45a982c0d5712311602ffff746a0e631e63f.tar.gz chromium_src-691f45a982c0d5712311602ffff746a0e631e63f.tar.bz2 | |
Land Recent QUIC Changes.
QUIC - manually sync'ing changes between chrome and internal source
code.
Refactorings to QuicCryptoServerConfig to allow for async quic client
hello validation.
Merge internal change: 56375103
- Remove the QuicConnectionPeer::GetCongestionManager method (can call
QuicConnection()::congestion_manager() directly now).
- Update a bunch of CongestionManager/SendAlgorithm methods to be const.
Merge internal change: 56361306
Change the QuicDispatcher to immediately put packets in time wait when
there is no version negotiation packet, instead of creating a new
session.
Merge internal change: 56353674
Add a new PacingSender which can be used to add pacing on top of an
existing QUIC sender.
Merge internal change: 56183480
Move StrikeRegisterClient to gfe/quic/crypto, so that
QuicCryptoServerConfig can depend on it. Implement a
StrikeRegisterClient that queries a local StrikeRegister.
See internal CL 56173502 for use cases.
Merge internal change: 56316281
R=rch@chromium.org
Review URL: https://codereview.chromium.org/75163007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235976 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools/quic/quic_server_test.cc')
| -rw-r--r-- | net/tools/quic/quic_server_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tools/quic/quic_server_test.cc b/net/tools/quic/quic_server_test.cc index 7d1d669..7d24edc 100644 --- a/net/tools/quic/quic_server_test.cc +++ b/net/tools/quic/quic_server_test.cc @@ -45,7 +45,7 @@ TEST_F(QuicServerDispatchPacketTest, DoNotDispatchPacketWithoutGUID) { // We expect the invalid packet to be dropped, and ProcessPacket should never // be called. - EXPECT_CALL(dispatcher_, ProcessPacket(_, _, _, _)).Times(0); + EXPECT_CALL(dispatcher_, ProcessPacket(_, _, _, _, _)).Times(0); MaybeDispatchPacket(encrypted_invalid_packet); } @@ -64,7 +64,7 @@ TEST_F(QuicServerDispatchPacketTest, DispatchValidPacket) { QuicEncryptedPacket encrypted_valid_packet(QuicUtils::AsChars(valid_packet), arraysize(valid_packet), false); - EXPECT_CALL(dispatcher_, ProcessPacket(_, _, _, _)).Times(1); + EXPECT_CALL(dispatcher_, ProcessPacket(_, _, _, _, _)).Times(1); MaybeDispatchPacket(encrypted_valid_packet); } |