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 5fee644b5463ff874af9fe1ef2242f8e3bb2fd10..f166555998376165fdc1513787f8197e7fb4482e 100644
--- a/net/tools/quic/quic_server.h
+++ b/net/tools/quic/quic_server.h
@@ -29,7 +29,8 @@ class QuicDispatcher;
 class QuicServer : public EpollCallbackInterface {
  public:
   QuicServer();
-  explicit QuicServer(const QuicConfig& config);
+  QuicServer(const QuicConfig& config,
+             const QuicVersionVector& supported_versions);
 
   virtual ~QuicServer();
 
@@ -114,6 +115,12 @@ class QuicServer : public EpollCallbackInterface {
   // crypto_config_ contains crypto parameters for the handshake.
   QuicCryptoServerConfig crypto_config_;
 
+  // This vector contains QUIC versions which we currently support.
+  // This should be ordered such that the highest supported version is the first
+  // element, with subsequent elements in descending order (versions can be
+  // skipped as necessary).
+  QuicVersionVector supported_versions_;
+
   DISALLOW_COPY_AND_ASSIGN(QuicServer);
 };