Land Recent QUIC changes.

net/tools/quic/test_tools/quic_test_client.cc

 // 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.
 
 #include "net/tools/quic/test_tools/quic_test_client.h"
 
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
 #include "net/cert/cert_verify_result.h"
 #include "net/cert/x509_certificate.h"
@@ skipping 67 matching lines @@
       !uri.starts_with("http://")) {
     // If we have a relative URL, set some defaults.
     string full_uri = secure ? "https://www.google.com" :
                                "http://www.google.com";
     full_uri.append(uri.as_string());
     headers->SetRequestUri(full_uri);
   }
   return headers;
 }
 
-QuicTestClient::QuicTestClient(IPEndPoint address, const string& hostname)
-    : client_(address, hostname) {
+QuicTestClient::QuicTestClient(IPEndPoint address, const string& hostname,
+                               const QuicVersion version)
+    : client_(address, hostname, version) {
   Initialize(address, hostname);
 }
 
 QuicTestClient::QuicTestClient(IPEndPoint address,
                                const string& hostname,
-                               bool secure)
-    : client_(address, hostname) {
+                               bool secure,
+                               const QuicVersion version)
+    : client_(address, hostname, version) {
   Initialize(address, hostname);
   secure_ = secure;
   // TODO(alyssar, agl) uncomment here and below when default certs are allowed.
   // ExpectCertificates(secure_);
 }
 
 QuicTestClient::QuicTestClient(IPEndPoint address,
                                const string& hostname,
-                               const QuicConfig& config)
-    : client_(address, hostname, config) {
+                               const QuicConfig& config,
+                               const QuicVersion version)
+    : client_(address, hostname, config, version) {
   Initialize(address, hostname);
 }
 
 void QuicTestClient::Initialize(IPEndPoint address, const string& hostname) {
   server_address_ = address;
   stream_ = NULL;
   stream_error_ = QUIC_STREAM_NO_ERROR;
   connection_error_ = QUIC_NO_ERROR;
   bytes_read_ = 0;
   bytes_written_= 0;
@@ skipping 167 matching lines @@
   stream_error_ = stream_->stream_error();
   connection_error_ = stream_->connection_error();
   bytes_read_ = stream_->stream_bytes_read();
   bytes_written_ = stream_->stream_bytes_written();
   stream_ = NULL;
 }
 
 }  // namespace test
 }  // namespace tools
 }  // namespace net