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 2d19e6c7d485857b4d8fd61d2a9e13c6be4f01bc..9cfaa3e005c6ae7f206923462f73fda74827355b 100644
--- a/net/tools/quic/quic_client.h
+++ b/net/tools/quic/quic_client.h
@@ -27,6 +27,10 @@ namespace tools {
 class QuicClient : public EpollCallbackInterface {
  public:
   QuicClient(IPEndPoint server_address, const std::string& server_hostname);
+  QuicClient(IPEndPoint server_address,
+             const std::string& server_hostname,
+             const QuicConfig& config);
+
   virtual ~QuicClient();
 
   // Initializes the client to create a connection. Should be called exactly
@@ -116,6 +120,11 @@ class QuicClient : public EpollCallbackInterface {
   // Hostname of the server. This may be a DNS name or an IP address literal.
   const std::string server_hostname_;
 
+  // config_ and crypto_config_ contain configuration and cached state about
+  // servers.
+  QuicConfig config_;
+  QuicCryptoClientConfig crypto_config_;
+
   // Address of the client if the client is connected to the server.
   IPEndPoint client_address_;
 
@@ -143,11 +152,6 @@ class QuicClient : public EpollCallbackInterface {
   // because the socket would otherwise overflow.
   bool overflow_supported_;
 
-  // config_ and crypto_config_ contain configuration and cached state about
-  // servers.
-  QuicConfig config_;
-  QuicCryptoClientConfig crypto_config_;
-
   DISALLOW_COPY_AND_ASSIGN(QuicClient);
 };