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

net/quic/core/quic_buffered_packet_store.h

 // Copyright (c) 2016 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.
 
 #ifndef NET_QUIC_QUIC_BUFFERED_PACKET_STORE_H_
 #define NET_QUIC_QUIC_BUFFERED_PACKET_STORE_H_
 
 #include "net/base/linked_hash_map.h"
 #include "net/base/net_export.h"
 #include "net/quic/core/quic_alarm.h"
 #include "net/quic/core/quic_alarm_factory.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/core/quic_time.h"
 #include "net/quic/platform/api/quic_socket_address.h"
 
 namespace net {
 
 namespace test {
 class QuicBufferedPacketStorePeer;
 }  // namespace test
 
 // This class buffers packets for each connection until either
@@ skipping 128 matching lines @@
   std::unique_ptr<QuicAlarm> expiration_alarm_;
 
   // Keeps track of connection with CHLO buffered up already and the order they
   // arrive.
   linked_hash_map<QuicConnectionId, bool> connections_with_chlo_;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_BUFFERED_PACKET_STORE_H_