Land Recent QUIC Changes

net/tools/quic/quic_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/quic_client.h"
 
 #include <errno.h>
 #include <netinet/in.h>
 #include <string.h>
 #include <sys/epoll.h>
@@ skipping 21 matching lines @@
 QuicClient::QuicClient(IPEndPoint server_address,
                        const string& server_hostname)
     : server_address_(server_address),
       server_hostname_(server_hostname),
       local_port_(0),
       fd_(-1),
       initialized_(false),
       packets_dropped_(0),
       overflow_supported_(false) {
   epoll_server_.set_timeout_in_us(50 * 1000);
+  config_.SetDefaults();
+  crypto_config_.SetDefaults();
 }
 
 QuicClient::~QuicClient() {
   if (connected()) {
     session()->connection()
         ->SendConnectionClosePacket(QUIC_PEER_GOING_AWAY, std::string());
   }
 }
 
 bool QuicClient::Initialize() {
@@ skipping 70 matching lines @@
     WaitForEvents();
   }
   return session_->connection()->connected();
 }
 
 
 bool QuicClient::StartConnect() {
   DCHECK(!connected() && initialized_);
 
   QuicGuid guid = QuicRandom::GetInstance()->RandUint64();
-  session_.reset(new QuicClientSession(server_hostname_, new QuicConnection(
-      guid, server_address_,
-      new QuicEpollConnectionHelper(fd_, &epoll_server_), false)));
+  session_.reset(new QuicClientSession(
+      server_hostname_,
+      config_,
+      new QuicConnection(guid, server_address_,
+                         new QuicEpollConnectionHelper(fd_, &epoll_server_),
+                         false),
+      &crypto_config_));
   return session_->CryptoConnect();
 }
 
 bool QuicClient::CryptoHandshakeInProgress() {
   return !session_->IsCryptoHandshakeComplete() &&
       session_->connection()->connected();
 }
 
 void QuicClient::Disconnect() {
   DCHECK(connected());
@@ skipping 94 matching lines @@
   }
 
   IPEndPoint client_address(client_ip, client_address_.port());
   session_->connection()->ProcessUdpPacket(
       client_address, server_address, packet);
   return true;
 }
 
 }  // namespace tools
 }  // namespace net