Land Recent QUIC Changes.

net/quic/test_tools/quic_test_utils.h

Index: net/quic/test_tools/quic_test_utils.h
diff --git a/net/quic/test_tools/quic_test_utils.h b/net/quic/test_tools/quic_test_utils.h
index e230dca960a4463bbfda721d19d558b229ea72d2..5432c3056a9517db89beaabe79b7af6896c6c87d 100644
--- a/net/quic/test_tools/quic_test_utils.h
+++ b/net/quic/test_tools/quic_test_utils.h
@@ -88,7 +88,7 @@ class ValueRestore {
 class MockFramerVisitor : public QuicFramerVisitorInterface {
  public:
   MockFramerVisitor();
-  ~MockFramerVisitor();
+  virtual ~MockFramerVisitor() OVERRIDE;
 
   MOCK_METHOD1(OnError, void(QuicFramer* framer));
   // The constructor sets this up to return false by default.
@@ -155,7 +155,7 @@ class NoOpFramerVisitor : public QuicFramerVisitorInterface {
 class FramerVisitorCapturingPublicReset : public NoOpFramerVisitor {
  public:
   FramerVisitorCapturingPublicReset();
-  virtual ~FramerVisitorCapturingPublicReset();
+  virtual ~FramerVisitorCapturingPublicReset() OVERRIDE;
 
   virtual void OnPublicResetPacket(
       const QuicPublicResetPacket& packet) OVERRIDE;
@@ -171,7 +171,7 @@ class FramerVisitorCapturingPublicReset : public NoOpFramerVisitor {
 class FramerVisitorCapturingFrames : public NoOpFramerVisitor {
  public:
   FramerVisitorCapturingFrames();
-  virtual ~FramerVisitorCapturingFrames();
+  virtual ~FramerVisitorCapturingFrames() OVERRIDE;
 
   // Reset the visitor to it's initial state.
   void Reset();
@@ -224,7 +224,7 @@ class FramerVisitorCapturingFrames : public NoOpFramerVisitor {
 class MockConnectionVisitor : public QuicConnectionVisitorInterface {
  public:
   MockConnectionVisitor();
-  virtual ~MockConnectionVisitor();
+  virtual ~MockConnectionVisitor() OVERRIDE;
 
   MOCK_METHOD1(OnStreamFrames, bool(const std::vector<QuicStreamFrame>& frame));
   MOCK_METHOD1(OnRstStream, void(const QuicRstStreamFrame& frame));
@@ -243,7 +243,7 @@ class MockConnectionVisitor : public QuicConnectionVisitorInterface {
 class MockHelper : public QuicConnectionHelperInterface {
  public:
   MockHelper();
-  virtual ~MockHelper();
+  virtual ~MockHelper() OVERRIDE;
 
   MOCK_METHOD1(SetConnection, void(QuicConnection* connection));
   const QuicClock* GetClock() const;
@@ -270,7 +270,7 @@ class MockConnection : public QuicConnection {
   // Uses a Mock helper, GUID of 42, and 127.0.0.1:123.
   MockConnection(bool is_server, const QuicVersionVector& supported_versions);
 
-  virtual ~MockConnection();
+  virtual ~MockConnection() OVERRIDE;
 
   // If the constructor that uses a MockHelper has been used then this method
   // will advance the time of the MockClock.
@@ -314,7 +314,7 @@ class PacketSavingConnection : public MockConnection {
   PacketSavingConnection(bool is_server,
                          const QuicVersionVector& supported_versions);
 
-  virtual ~PacketSavingConnection();
+  virtual ~PacketSavingConnection() OVERRIDE;
 
   virtual bool SendOrQueuePacket(EncryptionLevel level,
                                  const SerializedPacket& packet,
@@ -330,7 +330,7 @@ class PacketSavingConnection : public MockConnection {
 class MockSession : public QuicSession {
  public:
   explicit MockSession(QuicConnection* connection);
-  virtual ~MockSession();
+  virtual ~MockSession() OVERRIDE;
 
   MOCK_METHOD4(OnPacket, bool(const IPEndPoint& self_address,
                               const IPEndPoint& peer_address,
@@ -364,7 +364,7 @@ class MockSession : public QuicSession {
 class TestSession : public QuicSession {
  public:
   TestSession(QuicConnection* connection, const QuicConfig& config);
-  virtual ~TestSession();
+  virtual ~TestSession() OVERRIDE;
 
   MOCK_METHOD1(CreateIncomingDataStream, QuicDataStream*(QuicStreamId id));
   MOCK_METHOD0(CreateOutgoingDataStream, QuicDataStream*());
@@ -381,7 +381,7 @@ class TestSession : public QuicSession {
 class MockPacketWriter : public QuicPacketWriter {
  public:
   MockPacketWriter();
-  virtual ~MockPacketWriter();
+  virtual ~MockPacketWriter() OVERRIDE;
 
   MOCK_METHOD5(WritePacket,
                WriteResult(const char* buffer,
@@ -395,7 +395,7 @@ class MockPacketWriter : public QuicPacketWriter {
 class MockSendAlgorithm : public SendAlgorithmInterface {
  public:
   MockSendAlgorithm();
-  virtual ~MockSendAlgorithm();
+  virtual ~MockSendAlgorithm() OVERRIDE;
 
   MOCK_METHOD2(SetFromConfig, void(const QuicConfig& config, bool is_server));
   MOCK_METHOD1(SetMaxPacketSize, void(QuicByteCount max_packet_size));
@@ -409,7 +409,7 @@ class MockSendAlgorithm : public SendAlgorithmInterface {
   MOCK_METHOD5(OnPacketSent,
                bool(QuicTime sent_time, QuicPacketSequenceNumber, QuicByteCount,
                     TransmissionType, HasRetransmittableData));
-  MOCK_METHOD0(OnRetransmissionTimeout, void());
+  MOCK_METHOD1(OnRetransmissionTimeout, void(bool));
   MOCK_METHOD2(OnPacketAbandoned, void(QuicPacketSequenceNumber sequence_number,
                                       QuicByteCount abandoned_bytes));
   MOCK_METHOD4(TimeUntilSend, QuicTime::Delta(QuicTime now, TransmissionType,
@@ -428,7 +428,7 @@ class TestEntropyCalculator :
       public QuicReceivedEntropyHashCalculatorInterface {
  public:
   TestEntropyCalculator();
-  virtual ~TestEntropyCalculator();
+  virtual ~TestEntropyCalculator() OVERRIDE;
 
   virtual QuicPacketEntropyHash EntropyHash(
       QuicPacketSequenceNumber sequence_number) const OVERRIDE;
@@ -437,7 +437,7 @@ class TestEntropyCalculator :
 class MockEntropyCalculator : public TestEntropyCalculator {
  public:
   MockEntropyCalculator();
-  virtual ~MockEntropyCalculator();
+  virtual ~MockEntropyCalculator() OVERRIDE;
 
   MOCK_CONST_METHOD1(
       EntropyHash,
@@ -446,7 +446,7 @@ class MockEntropyCalculator : public TestEntropyCalculator {
 
 class TestDecompressorVisitor : public QuicSpdyDecompressor::Visitor {
  public:
-  virtual ~TestDecompressorVisitor() {}
+  virtual ~TestDecompressorVisitor() OVERRIDE {}
   virtual bool OnDecompressedData(base::StringPiece data) OVERRIDE;
   virtual void OnDecompressionError() OVERRIDE;
 
@@ -461,7 +461,7 @@ class TestDecompressorVisitor : public QuicSpdyDecompressor::Visitor {
 class MockAckNotifierDelegate : public QuicAckNotifier::DelegateInterface {
  public:
   MockAckNotifierDelegate();
-  virtual ~MockAckNotifierDelegate();
+  virtual ~MockAckNotifierDelegate() OVERRIDE;
 
   MOCK_METHOD0(OnAckNotification, void());
 };