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

net/quic/core/quic_multipath_transmissions_map.h

 // Copyright (c) 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 map manages packets which are transmitted across multiple paths.
 // For example, a packet is originally transmitted on path 1 with packet number
 // 1. Then this packet is retransmitted on path 2 with packet number 1. (1, 1)
 // and (2, 1) are inserted into this map. Suppose (2, 1) is detected lost and
 // gets retransmitted on path 2 with packet 2. (2, 2) will not be inserted
 // because this transmission does not "across" path compared to (2, 1).
 
 #ifndef NET_QUIC_QUIC_MULTIPATH_TRANSMISSIONS_MAP_H_
 #define NET_QUIC_QUIC_MULTIPATH_TRANSMISSIONS_MAP_H_
 
 #include <deque>
 #include <unordered_map>
 
 #include "base/macros.h"
 #include "net/base/net_export.h"
-#include "net/quic/core/quic_protocol.h"
+#include "net/quic/core/quic_packets.h"
 #include "net/quic/core/quic_utils.h"
 
 namespace net {
 
 typedef std::pair<QuicPathId, QuicPacketNumber> QuicPathIdPacketNumber;
 
 class NET_EXPORT_PRIVATE QuicMultipathTransmissionsMap {
  public:
   struct QuicPathIdPacketNumberHash {
     size_t operator()(std::pair<QuicPathId, QuicPacketNumber> value) const {
@@ skipping 34 matching lines @@
   // packet has been transmitted as (1, 1) and (2, 1), two entries are added
   // to this map and both values point to the same list: {(1, 1), (2, 1)}.
   // The MultipathTransmissionsList is owned by the transmission which is
   // received first (on any path).
   MultipathTransmissionsMap transmission_map_;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_MULTIPATH_TRANSMISSIONS_MAP_H_