summaryrefslogtreecommitdiffstats
path: root/net/quic/crypto/strike_register_test.cc
diff options
context:
space:
mode:
authorrtenneti <rtenneti@chromium.org>2015-07-17 17:19:53 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-18 00:20:38 +0000
commit6bd660b0e63a624087af07744e3d5ab9a61e06db (patch)
tree67a6133d1da7b78d56b723f21920b59d8a2bf6e7 /net/quic/crypto/strike_register_test.cc
parentaf16d8d226f8bf839eae32779fea2d463645b1ea (diff)
downloadchromium_src-6bd660b0e63a624087af07744e3d5ab9a61e06db.zip
chromium_src-6bd660b0e63a624087af07744e3d5ab9a61e06db.tar.gz
chromium_src-6bd660b0e63a624087af07744e3d5ab9a61e06db.tar.bz2
Landing Recent QUIC changes until 7/1/2015 19:46 UTC.
relnote: Call methods to handle QUIC frames immediately instead of waiting for all to be processed. Protected by FLAGS_quic_process_frames_inline Saves ~2% of CPU. Merge internal change: 97354883 Changed QuicHttpStreamTest to work with the new flag. https://codereview.chromium.org/1237453008/ relnote: Change QuicConnectionVisitorInterface::OnStreamFrames to OnStreamFrame as well as OnBlockedFrames and OnWindowUpdateFrames. No functional change. Merge internal change: 97339157 https://codereview.chromium.org/1231343004/ relnote: Fix FLAGS_quic_delay_retransmission_alarm, which was backwards. Merge internal change: 97271704 https://codereview.chromium.org/1233313007/ relnote: Initialize all fields in QuicRstStreamFrame FIXED=22194074 Merge internal change: 97230073 https://codereview.chromium.org/1240903003/ relnote: Deprecate FLAGS_quic_dont_ack_acks. Merge internal change: 97227483 https://codereview.chromium.org/1232793004/ relnote: Convert the map into a list in QuicStreamSequencer. Merge internal change: 97162517 Added missing RandomFramesNoDroppingBackup unittest. https://codereview.chromium.org/1237623014/ Allow QuicClient to set connection MTU before the handshake is sent. relnote: n/a (interface to be used by non-GFE code) FIXED=22166288 Merge internal change: 97160807 https://codereview.chromium.org/1240953002/ Cleanup changes: Rename QuicSession::MarkWriteBlocked to QuicSession::MarkConnectionLevelWriteBlocked. Replace "> >" with ">>". Put #includes in proper order. Log a StringPiece correctly. Change "virtual" to "override" where clang_tidy objects. Name a temporary object. Add braces around "for" loops. clang-format changes. Merge internal change: 97160447 https://codereview.chromium.org/1227353005/ R=rch@chromium.org Review URL: https://codereview.chromium.org/1235083007 Cr-Commit-Position: refs/heads/master@{#339364}
Diffstat (limited to 'net/quic/crypto/strike_register_test.cc')
-rw-r--r--net/quic/crypto/strike_register_test.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/quic/crypto/strike_register_test.cc b/net/quic/crypto/strike_register_test.cc
index b2a73c8..cbb189a 100644
--- a/net/quic/crypto/strike_register_test.cc
+++ b/net/quic/crypto/strike_register_test.cc
@@ -234,7 +234,7 @@ class SlowStrikeRegister {
pair<uint32, string> nonce = std::make_pair(
nonce_time, string(reinterpret_cast<const char*>(nonce_bytes), 32));
- set<pair<uint32, string> >::const_iterator it = nonces_.find(nonce);
+ set<pair<uint32, string>>::const_iterator it = nonces_.find(nonce);
if (it != nonces_.end()) {
return NONCE_NOT_UNIQUE_FAILURE;
}
@@ -271,7 +271,7 @@ class SlowStrikeRegister {
}
void DropOldestEntry() {
- set<pair<uint32, string> >::iterator oldest = nonces_.begin();
+ set<pair<uint32, string>>::iterator oldest = nonces_.begin();
horizon_ = oldest->first + 1;
nonces_.erase(oldest);
}
@@ -282,7 +282,7 @@ class SlowStrikeRegister {
uint8 orbit_[8];
uint32 horizon_;
- set<pair<uint32, string> > nonces_;
+ set<pair<uint32, string>> nonces_;
};
class StrikeRegisterStressTest : public ::testing::Test {