| Index: net/quic/core/quic_framer_test.cc
|
| diff --git a/net/quic/core/quic_framer_test.cc b/net/quic/core/quic_framer_test.cc
|
| index 47b3c53b06d1e588e1eb21d1ea467727233fa329..b3d5d8dab7dd213c2f2484c818eed14905bbf5ac 100644
|
| --- a/net/quic/core/quic_framer_test.cc
|
| +++ b/net/quic/core/quic_framer_test.cc
|
| @@ -322,18 +322,18 @@ class TestQuicVisitor : public QuicFramerVisitorInterface {
|
| std::unique_ptr<QuicPacketPublicHeader> public_header_;
|
| std::unique_ptr<QuicPublicResetPacket> public_reset_packet_;
|
| std::unique_ptr<QuicVersionNegotiationPacket> version_negotiation_packet_;
|
| - vector<std::unique_ptr<QuicStreamFrame>> stream_frames_;
|
| - vector<std::unique_ptr<QuicAckFrame>> ack_frames_;
|
| - vector<std::unique_ptr<QuicStopWaitingFrame>> stop_waiting_frames_;
|
| - vector<std::unique_ptr<QuicPaddingFrame>> padding_frames_;
|
| - vector<std::unique_ptr<QuicPingFrame>> ping_frames_;
|
| + std::vector<std::unique_ptr<QuicStreamFrame>> stream_frames_;
|
| + std::vector<std::unique_ptr<QuicAckFrame>> ack_frames_;
|
| + std::vector<std::unique_ptr<QuicStopWaitingFrame>> stop_waiting_frames_;
|
| + std::vector<std::unique_ptr<QuicPaddingFrame>> padding_frames_;
|
| + std::vector<std::unique_ptr<QuicPingFrame>> ping_frames_;
|
| QuicRstStreamFrame rst_stream_frame_;
|
| QuicConnectionCloseFrame connection_close_frame_;
|
| QuicGoAwayFrame goaway_frame_;
|
| QuicWindowUpdateFrame window_update_frame_;
|
| QuicBlockedFrame blocked_frame_;
|
| QuicPathCloseFrame path_close_frame_;
|
| - vector<std::unique_ptr<string>> stream_data_;
|
| + std::vector<std::unique_ptr<string>> stream_data_;
|
| };
|
|
|
| class QuicFramerTest : public ::testing::TestWithParam<QuicVersion> {
|
| @@ -582,7 +582,7 @@ TEST_P(QuicFramerTest, CalculatePacketNumberFromWireNearNextEpoch) {
|
| }
|
|
|
| TEST_P(QuicFramerTest, CalculatePacketNumberFromWireNearNextMax) {
|
| - const uint64_t max_number = numeric_limits<uint64_t>::max();
|
| + const uint64_t max_number = std::numeric_limits<uint64_t>::max();
|
| const uint64_t max_epoch = max_number & ~kMask;
|
|
|
| // Cases where the last number was close to the end of the range
|
|
|