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

net/quic/core/quic_multipath_received_packet_manager.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 connection level received packet manager which manages multiple per path
 // received packet managers.
 
 #ifndef NET_QUIC_QUIC_MULTIPATH_RECEIVED_PACKET_MANAGER_H_
 #define NET_QUIC_QUIC_MULTIPATH_RECEIVED_PACKET_MANAGER_H_
 
 #include <memory>
 #include <unordered_map>
 #include <vector>
 
 #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_received_packet_manager.h"
 
 namespace net {
 
 namespace test {
 class QuicMultipathReceivedPacketManagerPeer;
 }  // namespace test
 
 class NET_EXPORT_PRIVATE QuicMultipathReceivedPacketManager {
  public:
@@ skipping 43 matching lines @@
   friend class test::QuicMultipathReceivedPacketManagerPeer;
 
   // Map mapping path id to path received packet manager.
   std::unordered_map<QuicPathId, std::unique_ptr<QuicReceivedPacketManager>>
       path_managers_;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_MULTIPATH_RECEIVED_PACKET_MANAGER_H_