Land Recent QUIC changes.

net/tools/quic/quic_client.h

Index: net/tools/quic/quic_client.h
diff --git a/net/tools/quic/quic_client.h b/net/tools/quic/quic_client.h
index c8e65a1d53e96bf03896e5d72f55a12e88319893..4835f4b00ece1366235d35a339e23ae20f635038 100644
--- a/net/tools/quic/quic_client.h
+++ b/net/tools/quic/quic_client.h
@@ -39,12 +39,12 @@ class QuicClient : public EpollCallbackInterface,
  public:
   QuicClient(IPEndPoint server_address,
              const string& server_hostname,
-             const QuicVersion version,
+             const QuicVersionVector& supported_versions,
              bool print_response);
   QuicClient(IPEndPoint server_address,
              const std::string& server_hostname,
              const QuicConfig& config,
-             const QuicVersion version);
+             const QuicVersionVector& supported_versions);
 
   virtual ~QuicClient();
 
@@ -201,8 +201,12 @@ class QuicClient : public EpollCallbackInterface,
   // because the socket would otherwise overflow.
   bool overflow_supported_;
 
-  // Which QUIC version does this client talk?
-  QuicVersion version_;
+  // 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). We will always pick supported_versions_[0] as the
+  // initial version to use.
+  QuicVersionVector supported_versions_;
 
   // If true, then the contents of each response will be printed to stdout
   // when the stream is closed (in OnClose).