Land Recent QUIC changes.

net/tools/quic/test_tools/quic_test_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.
 
 #ifndef NET_QUIC_TEST_TOOLS_QUIC_CLIENT_H_
 #define NET_QUIC_TEST_TOOLS_QUIC_CLIENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "net/quic/quic_framer.h"
 #include "net/quic/quic_packet_creator.h"
 #include "net/quic/quic_protocol.h"
 #include "net/tools/quic/quic_client.h"
 
 namespace net {
 
 class ProofVerifier;
 
 namespace tools {
 
 namespace test {
 
 class HTTPMessage;
 
 // A toy QUIC client used for testing.
 class QuicTestClient :  public ReliableQuicStream::Visitor {
  public:
-  QuicTestClient(IPEndPoint server_address, const string& server_hostname);
+  QuicTestClient(IPEndPoint server_address, const string& server_hostname,
+                 const QuicVersion version);
   QuicTestClient(IPEndPoint server_address,
                  const string& server_hostname,
-                 bool secure);
+                 bool secure,
+                 const QuicVersion version);
   QuicTestClient(IPEndPoint server_address,
                  const string& server_hostname,
-                 const QuicConfig& config);
+                 const QuicConfig& config,
+                 const QuicVersion version);
 
   virtual ~QuicTestClient();
 
   // ExpectCertificates controls whether the server is expected to provide
   // certificates. The certificates, if any, are not verified, but the common
   // name is recorded and available with |cert_common_name()|.
   void ExpectCertificates(bool on);
 
   // Clears any outstanding state and sends a simple GET of 'uri' to the
   // server.  Returns 0 if the request failed and no bytes were written.
@@ skipping 61 matching lines @@
   uint64 bytes_read_;
   uint64 bytes_written_;
   // True if the client has never connected before.  The client will
   // auto-connect exactly once before sending data.  If something causes a
   // connection reset, it will not automatically reconnect.
   bool never_connected_;
   bool secure_;
   // If true, the client will always reconnect if necessary before creating a
   // stream.
   bool auto_reconnect_;
+
   // proof_verifier_ points to a RecordingProofVerifier that is owned by
   // client_.
   ProofVerifier* proof_verifier_;
 };
 
 }  // namespace test
 
 }  // namespace tools
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_QUIC_CLIENT_H_