Land Recent QUIC Changes.

net/tools/quic/quic_server_session.h

 // Copyright (c) 2012 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.
 //
 // A server specific QuicSession subclass.
 
 #ifndef NET_TOOLS_QUIC_QUIC_SERVER_SESSION_H_
 #define NET_TOOLS_QUIC_QUIC_SERVER_SESSION_H_
 
 #include <set>
@@ skipping 30 matching lines @@
 
 class QuicServerSession : public QuicSession {
  public:
   QuicServerSession(const QuicConfig& config,
                     QuicConnection *connection,
                     QuicSessionOwner* owner);
 
   // Override the base class to notify the owner of the connection close.
   virtual void OnConnectionClosed(QuicErrorCode error, bool from_peer) OVERRIDE;
 
-  virtual ~QuicServerSession();
+  virtual ~QuicServerSession() OVERRIDE;
 
   virtual void InitializeSession(const QuicCryptoServerConfig& crypto_config);
 
   const QuicCryptoServerStream* crypto_stream() const {
     return crypto_stream_.get();
   }
 
  protected:
   // QuicSession methods:
   virtual QuicDataStream* CreateIncomingDataStream(QuicStreamId id) OVERRIDE;
@@ skipping 14 matching lines @@
   scoped_ptr<QuicCryptoServerStream> crypto_stream_;
   QuicSessionOwner* owner_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicServerSession);
 };
 
 }  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_SERVER_SESSION_H_