Land Recent QUIC changes

net/tools/quic/quic_server.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_server.h"
 
 #include <errno.h>
 #include <features.h>
 #include <netinet/in.h>
 #include <string.h>
@@ skipping 33 matching lines @@
   // Initialize the in memory cache now.
   QuicInMemoryCache::GetInstance();
 
   // Use hardcoded crypto parameters for now.
   config_.SetDefaults();
   CryptoHandshakeMessage extra_tags;
   config_.ToHandshakeMessage(&extra_tags);
   QuicEpollClock clock(&epoll_server_);
 
   scoped_ptr<CryptoHandshakeMessage> scfg(
-      crypto_config_.AddDefaultConfig(QuicRandom::GetInstance(), &clock,
-                                      extra_tags));
+      crypto_config_.AddDefaultConfig(
+          QuicRandom::GetInstance(), &clock, extra_tags,
+          QuicCryptoServerConfig::kDefaultExpiry));
   // If we were using the same config in many servers then we would have to
   // parse a QuicConfig from config_tags here.
   if (!config_.SetFromHandshakeMessage(*scfg)) {
     CHECK(false) << "Crypto config could not be parsed by QuicConfig.";
   }
 }
 
 QuicServer::~QuicServer() {
 }
 
@@ skipping 132 matching lines @@
   }
 
   IPEndPoint server_address(server_ip, port);
   dispatcher->ProcessPacket(server_address, client_address, guid, packet);
 
   return true;
 }
 
 }  // namespace tools
 }  // namespace net