Landing Recent QUIC changes until Fri Nov 18 23:21:04 2016 +0000

net/tools/quic/quic_packet_reader.h

 // Copyright 2015 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 class to read incoming QUIC packets from the UDP socket.
 
 #ifndef NET_TOOLS_QUIC_QUIC_PACKET_READER_H_
 #define NET_TOOLS_QUIC_QUIC_PACKET_READER_H_
 
 #include <netinet/in.h>
 #include <sys/socket.h>
 
 #include "base/macros.h"
 #include "net/quic/core/quic_clock.h"
-#include "net/quic/core/quic_protocol.h"
+#include "net/quic/core/quic_packets.h"
 #include "net/quic/platform/api/quic_socket_address.h"
 #include "net/tools/quic/quic_process_packet_interface.h"
 #include "net/tools/quic/quic_socket_utils.h"
 
 #define MMSG_MORE 0
 
 namespace net {
 
 #if MMSG_MORE
 // Read in larger batches to minimize recvmmsg overhead.
@@ skipping 58 matching lines @@
   PacketData packets_[kNumPacketsPerReadMmsgCall];
   mmsghdr mmsg_hdr_[kNumPacketsPerReadMmsgCall];
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(QuicPacketReader);
 };
 
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_PACKET_READER_H_