Land Recent QUIC Changes.

net/tools/quic/test_tools/quic_test_utils.h

Index: net/tools/quic/test_tools/quic_test_utils.h
diff --git a/net/tools/quic/test_tools/quic_test_utils.h b/net/tools/quic/test_tools/quic_test_utils.h
index 028b08c535625994335ee95f94263325e9c2feba..1cd302d279b69eb13c9a7d40a616d98e8a64998c 100644
--- a/net/tools/quic/test_tools/quic_test_utils.h
+++ b/net/tools/quic/test_tools/quic_test_utils.h
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// Common utilities for Quic tests
+
 #ifndef NET_TOOLS_QUIC_TEST_TOOLS_QUIC_TEST_UTILS_H_
 #define NET_TOOLS_QUIC_TEST_TOOLS_QUIC_TEST_UTILS_H_
 
@@ -58,7 +60,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.
@@ -96,7 +98,7 @@ class MockConnection : public QuicConnection {
 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*());
@@ -113,7 +115,7 @@ class TestSession : public QuicSession {
 class MockPacketWriter : public QuicPacketWriter {
  public:
   MockPacketWriter();
-  virtual ~MockPacketWriter();
+  virtual ~MockPacketWriter() OVERRIDE;
 
   MOCK_METHOD5(WritePacket,
                WriteResult(const char* buffer,
@@ -127,13 +129,13 @@ class MockPacketWriter : public QuicPacketWriter {
 class MockQuicSessionOwner : public QuicSessionOwner {
  public:
   MockQuicSessionOwner();
-  ~MockQuicSessionOwner();
+  virtual ~MockQuicSessionOwner() OVERRIDE;
   MOCK_METHOD2(OnConnectionClosed, void(QuicGuid guid, QuicErrorCode error));
 };
 
 class TestDecompressorVisitor : public QuicSpdyDecompressor::Visitor {
  public:
-  virtual ~TestDecompressorVisitor() {}
+  virtual ~TestDecompressorVisitor() OVERRIDE {}
   virtual bool OnDecompressedData(base::StringPiece data) OVERRIDE;
   virtual void OnDecompressionError() OVERRIDE;
 
@@ -148,7 +150,7 @@ class TestDecompressorVisitor : public QuicSpdyDecompressor::Visitor {
 class MockAckNotifierDelegate : public QuicAckNotifier::DelegateInterface {
  public:
   MockAckNotifierDelegate();
-  virtual ~MockAckNotifierDelegate();
+  virtual ~MockAckNotifierDelegate() OVERRIDE;
 
   MOCK_METHOD0(OnAckNotification, void());
 };