Land Recent QUIC Changes.

net/tools/quic/quic_server.h

Index: net/tools/quic/quic_server.h
diff --git a/net/tools/quic/quic_server.h b/net/tools/quic/quic_server.h
index 66ec4d9b718f9675f5b74531dea9eed6beeb7b8a..70b9f4cb3640be01afa3f65d3306ffcf35467c81 100644
--- a/net/tools/quic/quic_server.h
+++ b/net/tools/quic/quic_server.h
@@ -32,7 +32,7 @@ class QuicServer : public EpollCallbackInterface {
   QuicServer(const QuicConfig& config,
              const QuicVersionVector& supported_versions);
 
-  virtual ~QuicServer();
+  virtual ~QuicServer() OVERRIDE;
 
   // Start listening on the specified address.
   bool Listen(const IPEndPoint& address);
@@ -44,8 +44,9 @@ class QuicServer : public EpollCallbackInterface {
   void Shutdown();
 
   // From EpollCallbackInterface
-  virtual void OnRegistration(
-      EpollServer* eps, int fd, int event_mask) OVERRIDE {}
+  virtual void OnRegistration(EpollServer* eps,
+                              int fd,
+                              int event_mask) OVERRIDE {}
   virtual void OnModification(int fd, int event_mask) OVERRIDE {}
   virtual void OnEvent(int fd, EpollEvent* event) OVERRIDE;
   virtual void OnUnregistration(int fd, bool replaced) OVERRIDE {}