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 28 matching lines @@
       packets_dropped_(0),
       overflow_supported_(false),
       use_recvmmsg_(false),
       crypto_config_(kSourceAddressTokenSecret) {
   epoll_server_.set_timeout_in_us(50 * 1000);
   // 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,
+          QuicRandom::GetInstance(), &clock,
           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() {
 }
 
 bool QuicServer::Listen(const IPEndPoint& address) {
   port_ = address.port();
   int address_family = address.GetSockAddrFamily();
   fd_ = socket(address_family, SOCK_DGRAM | SOCK_NONBLOCK, IPPROTO_UDP);
   if (fd_ < 0) {
@@ skipping 127 matching lines @@
   }
 
   IPEndPoint server_address(server_ip, port);
   dispatcher->ProcessPacket(server_address, client_address, guid, packet);
 
   return true;
 }
 
 }  // namespace tools
 }  // namespace net