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 77b2eec391babbb979ef111fe41bdfd8d570c5ea..2b9b9e775b3bf8fb2c10f8d2fc284ce9975075b6 100644
--- a/net/tools/quic/quic_client.h
+++ b/net/tools/quic/quic_client.h
@@ -34,10 +34,12 @@ class QuicClientPeer;
 
 class QuicClient : public EpollCallbackInterface {
  public:
-  QuicClient(IPEndPoint server_address, const std::string& server_hostname);
+  QuicClient(IPEndPoint server_address, const std::string& server_hostname,
+             const QuicVersion version);
   QuicClient(IPEndPoint server_address,
              const std::string& server_hostname,
-             const QuicConfig& config);
+             const QuicConfig& config,
+             const QuicVersion version);
 
   virtual ~QuicClient();
 
@@ -130,6 +132,13 @@ class QuicClient : public EpollCallbackInterface {
     crypto_config_.SetProofVerifier(verifier);
   }
 
+  // SetChannelIDSigner sets a ChannelIDSigner that will be called when the
+  // server supports channel IDs to sign a message proving possession of the
+  // given ChannelID. This object takes ownership of |signer|.
+  void SetChannelIDSigner(ChannelIDSigner* signer) {
+    crypto_config_.SetChannelIDSigner(signer);
+  }
+
  private:
   friend class net::tools::test::QuicClientPeer;
 
@@ -177,6 +186,9 @@ class QuicClient : public EpollCallbackInterface {
   // because the socket would otherwise overflow.
   bool overflow_supported_;
 
+  // Which QUIC version does this client talk?
+  QuicVersion version_;
+
   DISALLOW_COPY_AND_ASSIGN(QuicClient);
 };