| Index: net/quic/quic_connection_test.cc
|
| diff --git a/net/quic/quic_connection_test.cc b/net/quic/quic_connection_test.cc
|
| index dd0f9a2c5498d66a4faf7109923eeb9847cc23b2..0f983058350e5dba10d6575306e99231497e45eb 100644
|
| --- a/net/quic/quic_connection_test.cc
|
| +++ b/net/quic/quic_connection_test.cc
|
| @@ -1577,9 +1577,9 @@ TEST_P(QuicConnectionTest, RecordSentTimeBeforePacketSent) {
|
|
|
| // Now pause during the write, and check the results.
|
| actual_recorded_send_time = QuicTime::Zero();
|
| - const QuicTime::Delta kWritePauseTimeDelta =
|
| + const QuicTime::Delta write_pause_time_delta =
|
| QuicTime::Delta::FromMilliseconds(5000);
|
| - SetWritePauseTimeDelta(kWritePauseTimeDelta);
|
| + SetWritePauseTimeDelta(write_pause_time_delta);
|
| expected_recorded_send_time = clock_.Now();
|
|
|
| EXPECT_CALL(*send_algorithm_, OnPacketSent(_, _, _, _, _))
|
| @@ -3672,14 +3672,14 @@ TEST_P(QuicConnectionTest, UpdateEntropyForReceivedPackets) {
|
| // Make 4th packet my least unacked, and update entropy for 2, 3 packets.
|
| QuicPacketCreatorPeer::SetSequenceNumber(&peer_creator_, 5);
|
| QuicPacketEntropyHash six_packet_entropy_hash = 0;
|
| - QuicPacketEntropyHash kRandomEntropyHash = 129u;
|
| + QuicPacketEntropyHash random_entropy_hash = 129u;
|
| QuicStopWaitingFrame frame = InitStopWaitingFrame(4);
|
| - frame.entropy_hash = kRandomEntropyHash;
|
| + frame.entropy_hash = random_entropy_hash;
|
| if (ProcessStopWaitingPacket(&frame)) {
|
| six_packet_entropy_hash = 1 << 6;
|
| }
|
|
|
| - EXPECT_EQ((kRandomEntropyHash + (1 << 5) + six_packet_entropy_hash),
|
| + EXPECT_EQ((random_entropy_hash + (1 << 5) + six_packet_entropy_hash),
|
| outgoing_ack()->entropy_hash);
|
| }
|
|
|
| @@ -3691,16 +3691,16 @@ TEST_P(QuicConnectionTest, UpdateEntropyHashUptoCurrentPacket) {
|
| ProcessDataPacket(22, 1, kEntropyFlag);
|
| EXPECT_EQ(66u, outgoing_ack()->entropy_hash);
|
| QuicPacketCreatorPeer::SetSequenceNumber(&peer_creator_, 22);
|
| - QuicPacketEntropyHash kRandomEntropyHash = 85u;
|
| + QuicPacketEntropyHash random_entropy_hash = 85u;
|
| // Current packet is the least unacked packet.
|
| QuicPacketEntropyHash ack_entropy_hash;
|
| QuicStopWaitingFrame frame = InitStopWaitingFrame(23);
|
| - frame.entropy_hash = kRandomEntropyHash;
|
| + frame.entropy_hash = random_entropy_hash;
|
| ack_entropy_hash = ProcessStopWaitingPacket(&frame);
|
| - EXPECT_EQ((kRandomEntropyHash + ack_entropy_hash),
|
| + EXPECT_EQ((random_entropy_hash + ack_entropy_hash),
|
| outgoing_ack()->entropy_hash);
|
| ProcessDataPacket(25, 1, kEntropyFlag);
|
| - EXPECT_EQ((kRandomEntropyHash + ack_entropy_hash + (1 << (25 % 8))),
|
| + EXPECT_EQ((random_entropy_hash + ack_entropy_hash + (1 << (25 % 8))),
|
| outgoing_ack()->entropy_hash);
|
| }
|
|
|
|
|