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 129 matching lines @@
     if (getsockname(fd_, storage.addr, &storage.addr_len) != 0 ||
         !server_address.FromSockAddr(storage.addr, storage.addr_len)) {
       LOG(ERROR) << "Unable to get self address.  Error: " << strerror(errno);
       return false;
     }
     port_ = server_address.port();
     LOG(INFO) << "Kernel assigned port is " << port_;
   }
 
   epoll_server_.RegisterFD(fd_, this, kEpollFlags);
-  dispatcher_.reset(new QuicDispatcher(config_, crypto_config_,
-                                       supported_versions_,
-                                       fd_, &epoll_server_));
+  dispatcher_.reset(new QuicDispatcher(
+      config_, crypto_config_, supported_versions_, &epoll_server_));
+  dispatcher_->Initialize(fd_);
 
   return true;
 }
 
 void QuicServer::WaitForEvents() {
   epoll_server_.WaitForEventsAndExecuteCallbacks();
 }
 
 void QuicServer::Shutdown() {
   // Before we shut down the epoll server, give all active sessions a chance to
@@ skipping 50 matching lines @@
   QuicEncryptedPacket packet(buf, bytes_read, false);
 
   IPEndPoint server_address(server_ip, port);
   dispatcher->ProcessPacket(server_address, client_address, packet);
 
   return true;
 }
 
 }  // namespace tools
 }  // namespace net