Land Recent QUIC Changes.

net/quic/congestion_control/inter_arrival_sender_test.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/congestion_control/inter_arrival_sender.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "net/quic/test_tools/mock_clock.h"
@@ skipping 13 matching lines @@
        nine_ms_(QuicTime::Delta::FromMilliseconds(9)),
        send_start_time_(send_clock_.Now()),
        sender_(&send_clock_),
        sequence_number_(1),
        acked_sequence_number_(1),
        feedback_sequence_number_(1) {
     send_clock_.AdvanceTime(one_ms_);
     receive_clock_.AdvanceTime(one_ms_);
   }
 
-  virtual ~InterArrivalSenderTest() {
+  virtual ~InterArrivalSenderTest() OVERRIDE {
     STLDeleteValues(&sent_packets_);
   }
 
   void SendAvailableCongestionWindow() {
     while (sender_.TimeUntilSend(send_clock_.Now(),
         NOT_RETRANSMISSION, HAS_RETRANSMITTABLE_DATA, NOT_HANDSHAKE).IsZero()) {
       QuicByteCount bytes_in_packet = kDefaultMaxPacketSize;
       sent_packets_[sequence_number_] =
           new class SendAlgorithmInterface::SentPacket(
               bytes_in_packet, send_clock_.Now());
@@ skipping 515 matching lines @@
     acked_sequence_number_ += 2;  // Create a loss by not acking both packets.
     SendFeedbackMessageNPackets(2, nine_ms_, nine_ms_);
 
     // Make sure our bitrate is fixed at the expected_min_bitrate.
     EXPECT_EQ(expected_min_bitrate, sender_.BandwidthEstimate());
   }
 }
 
 }  // namespace test
 }  // namespace net