Land Recent QUIC changes.

net/tools/quic/quic_client.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 toy client, which connects to a specified port and sends QUIC
 // request to that endpoint.
 
 #ifndef NET_TOOLS_QUIC_QUIC_CLIENT_H_
 #define NET_TOOLS_QUIC_QUIC_CLIENT_H_
 
@@ skipping 16 matching lines @@
 class ProofVerifier;
 
 namespace tools {
 
 namespace test {
 class QuicClientPeer;
 }  // namespace test
 
 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();
 
   // Initializes the client to create a connection. Should be called exactly
   // once before calling StartConnect or Connect. Returns true if the
   // initialization succeeds, false otherwise.
   bool Initialize();
 
   // "Connect" to the QUIC server, including performing synchronous crypto
   // handshake.
@@ skipping 72 matching lines @@
     server_hostname_ = hostname;
   }
 
   // SetProofVerifier sets the ProofVerifier that will be used to verify the
   // server's certificate and takes ownership of |verifier|.
   void SetProofVerifier(ProofVerifier* verifier) {
     // TODO(rtenneti): We should set ProofVerifier in QuicClientSession.
     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;
 
   // Read a UDP packet and hand it to the framer.
   bool ReadAndProcessPacket();
 
   // Set of streams created (and owned) by this client
   base::hash_set<QuicReliableClientStream*> streams_;
 
   // Address of the server.
@@ skipping 27 matching lines @@
 
   // If overflow_supported_ is true, this will be the number of packets dropped
   // during the lifetime of the server.  This may overflow if enough packets
   // are dropped.
   int packets_dropped_;
 
   // True if the kernel supports SO_RXQ_OVFL, the number of packets dropped
   // because the socket would otherwise overflow.
   bool overflow_supported_;
 
+  // Which QUIC version does this client talk?
+  QuicVersion version_;
+
   DISALLOW_COPY_AND_ASSIGN(QuicClient);
 };
 
 }  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_CLIENT_H_