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 7319c675fc8051c25bcb53cf63994fb9d240117e..a92c4ba6b4f3b5915f37bc7c9602016c9cfca2a4 100644
--- a/net/tools/quic/quic_server.cc
+++ b/net/tools/quic/quic_server.cc
@@ -46,19 +46,12 @@ QuicServer::QuicServer()
 
   // 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() {