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 {
 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,
+                 bool secure);
+  QuicTestClient(IPEndPoint server_address,
+                 const string& server_hostname,
                  const QuicConfig& config);
 
   virtual ~QuicTestClient();
 
   // 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.
   ssize_t SendRequest(const string& uri);
   ssize_t SendMessage(const HTTPMessage& message);
 
   string SendCustomSynchronousRequest(const HTTPMessage& message);
@@ skipping 28 matching lines @@
   QuicReliableClientStream* GetOrCreateStream();
 
   QuicRstStreamErrorCode stream_error() { return stream_error_; }
   QuicErrorCode connection_error() { return connection_error_; }
 
   QuicClient* client() { return &client_; }
 
   const string& response_body() {return response_;}
   bool connected() const;
 
+  void set_auto_reconnect(bool reconnect) { auto_reconnect_ = reconnect; }
+
  private:
+  void Initialize(IPEndPoint address, const string& hostname);
+
   IPEndPoint server_address_;
   IPEndPoint client_address_;
   QuicClient client_;  // The actual client
   QuicReliableClientStream* stream_;
 
   QuicRstStreamErrorCode stream_error_;
   QuicErrorCode connection_error_;
 
   BalsaHeaders headers_;
   string response_;
   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_;
 };
 
 }  // namespace test
 
 }  // namespace tools
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_QUIC_CLIENT_H_