Cleanup QUIC code to sync with internal version after recent changes.

net/tools/quic/quic_server.h

 // 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.
 //
 // A toy server, which listens on a specified address for QUIC traffic and
 // handles incoming responses.
 
 #ifndef NET_TOOLS_QUIC_QUIC_SERVER_H_
 #define NET_TOOLS_QUIC_QUIC_SERVER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/ip_endpoint.h"
 #include "net/quic/crypto/quic_crypto_server_config.h"
 #include "net/quic/quic_config.h"
 #include "net/quic/quic_connection_helper.h"
 #include "net/quic/quic_framer.h"
 #include "net/tools/epoll_server/epoll_server.h"
 #include "net/tools/quic/quic_default_packet_writer.h"
 
 namespace net {
-
 namespace tools {
 
 namespace test {
 class QuicServerPeer;
 }  // namespace test
 
 class ProcessPacketInterface;
 class QuicDispatcher;
 class QuicPacketReader;
 
@@ skipping 13 matching lines @@
 
   // Server deletion is imminent.  Start cleaning up the epoll server.
   void Shutdown();
 
   // From EpollCallbackInterface
   void OnRegistration(EpollServer* eps, int fd, int event_mask) override {}
   void OnModification(int fd, int event_mask) override {}
   void OnEvent(int fd, EpollEvent* event) override;
   void OnUnregistration(int fd, bool replaced) override {}
 
-  // Reads a packet from the given fd, and then passes it off to
-  // the QuicDispatcher.  Returns true if a packet is read, false
+  // Reads a number of packets from the given fd, and then passes them off to
+  // the QuicDispatcher.  Returns true if some packets are read, false
   // otherwise.
   // If packets_dropped is non-null, the socket is configured to track
   // dropped packets, and some packets are read, it will be set to the number of
   // dropped packets.
+  static bool ReadAndDispatchPackets(int fd, int port,
+                                     ProcessPacketInterface* processor,
+                                     QuicPacketCount* packets_dropped);
+  // Same as ReadAndDispatchPackets, only does one packet at a time.
   static bool ReadAndDispatchSinglePacket(int fd, int port,
                                           ProcessPacketInterface* processor,
                                           QuicPacketCount* packets_dropped);
 
   void OnShutdown(EpollServer* eps, int fd) override {}
 
   void SetStrikeRegisterNoStartupPeriod() {
     crypto_config_.set_strike_register_no_startup_period();
   }
 
@@ skipping 68 matching lines @@
 
   scoped_ptr<QuicPacketReader> packet_reader_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicServer);
 };
 
 }  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_SERVER_H_