Land Recent QUIC changes.

net/tools/quic/quic_server.cc

Index: net/tools/quic/quic_server.cc
diff --git a/net/tools/quic/quic_server.cc b/net/tools/quic/quic_server.cc
index adc2df1f713d230778af87f9be9cfbb7c29f5f6a..3728fd80eb67967c6bc35f037fc71dd5291299e3 100644
--- a/net/tools/quic/quic_server.cc
+++ b/net/tools/quic/quic_server.cc
@@ -39,7 +39,7 @@ QuicServer::QuicServer()
       packets_dropped_(0),
       overflow_supported_(false),
       use_recvmmsg_(false),
-      crypto_config_(kSourceAddressTokenSecret) {
+      crypto_config_(kSourceAddressTokenSecret, QuicRandom::GetInstance()) {
   // Use hardcoded crypto parameters for now.
   config_.SetDefaults();
   Initialize();
@@ -51,7 +51,7 @@ QuicServer::QuicServer(const QuicConfig& config)
       overflow_supported_(false),
       use_recvmmsg_(false),
       config_(config),
-      crypto_config_(kSourceAddressTokenSecret) {
+      crypto_config_(kSourceAddressTokenSecret, QuicRandom::GetInstance()) {
   Initialize();
 }
 
@@ -68,7 +68,7 @@ void QuicServer::Initialize() {
   scoped_ptr<CryptoHandshakeMessage> scfg(
       crypto_config_.AddDefaultConfig(
           QuicRandom::GetInstance(), &clock,
-          QuicCryptoServerConfig::kDefaultExpiry));
+          QuicCryptoServerConfig::ConfigOptions()));
 }
 
 QuicServer::~QuicServer() {
@@ -182,9 +182,9 @@ void QuicServer::OnEvent(int fd, EpollEvent* event) {
 }
 
 bool QuicServer::ReadAndDispatchSinglePacket(int fd,
-                                       int port,
-                                       QuicDispatcher* dispatcher,
-                                       int* packets_dropped) {
+                                             int port,
+                                             QuicDispatcher* dispatcher,
+                                             int* packets_dropped) {
   // Allocate some extra space so we can send an error if the client goes over
   // the limit.
   char buf[2 * kMaxPacketSize];