Landing Recent QUIC changes until 4/15/2016 17:20 UTC

net/tools/quic/quic_client_base.cc

 // Copyright (c) 2015 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_base.h"
 
 #include "net/quic/crypto/quic_random.h"
 #include "net/quic/quic_server_id.h"
 
 namespace net {
 
 QuicClientBase::QuicClientBase(const QuicServerId& server_id,
                                const QuicVersionVector& supported_versions,
                                const QuicConfig& config,
                                QuicConnectionHelperInterface* helper,
+                               QuicAlarmFactory* alarm_factory,
                                ProofVerifier* proof_verifier)
     : server_id_(server_id),
       config_(config),
       crypto_config_(proof_verifier),
       helper_(helper),
+      alarm_factory_(alarm_factory),
       supported_versions_(supported_versions),
       initial_max_packet_length_(0),
       num_stateless_rejects_received_(0),
       num_sent_client_hellos_(0),
       connection_error_(QUIC_NO_ERROR),
       connected_or_attempting_connect_(false) {}
 
 QuicClientBase::~QuicClientBase() {}
 
 bool QuicClientBase::Initialize() {
@@ skipping 111 matching lines @@
   return cached->has_server_designated_connection_id()
              ? cached->GetNextServerDesignatedConnectionId()
              : 0;
 }
 
 QuicConnectionId QuicClientBase::GenerateNewConnectionId() {
   return QuicRandom::GetInstance()->RandUint64();
 }
 
 }  // namespace net