Land Recent QUIC changes

net/tools/quic/test_tools/quic_test_client.h

Index: net/tools/quic/test_tools/quic_test_client.h
diff --git a/net/tools/quic/test_tools/quic_test_client.h b/net/tools/quic/test_tools/quic_test_client.h
index 343c99c1d868080980cf046bc3c11635571531e5..e7cb9763372b677c331d10bb0b69253f182cda5e 100644
--- a/net/tools/quic/test_tools/quic_test_client.h
+++ b/net/tools/quic/test_tools/quic_test_client.h
@@ -24,6 +24,10 @@ class HTTPMessage;
 class QuicTestClient :  public ReliableQuicStream::Visitor {
  public:
   QuicTestClient(IPEndPoint server_address, const string& server_hostname);
+  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