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

net/quic/core/congestion_control/bbr_sender.h

 // Copyright 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.
 
 // BBR (Bottleneck Bandwidth and RTT) congestion control algorithm.
 
 #ifndef NET_QUIC_CORE_CONGESTION_CONTROL_BBR_SENDER_H_
 #define NET_QUIC_CORE_CONGESTION_CONTROL_BBR_SENDER_H_
 
 #include <cstdint>
 #include <ostream>
 
 #include "net/quic/core/congestion_control/bandwidth_sampler.h"
 #include "net/quic/core/congestion_control/send_algorithm_interface.h"
 #include "net/quic/core/congestion_control/windowed_filter.h"
 #include "net/quic/core/crypto/quic_random.h"
 #include "net/quic/core/quic_bandwidth.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/core/quic_unacked_packet_map.h"
 
 namespace net {
 
 class RttStats;
 
 typedef uint64_t QuicRoundTripCount;
 
 // BbrSender implements BBR congestion control algorithm.  BBR aims to estimate
@@ skipping 245 matching lines @@
 };
 
 NET_EXPORT_PRIVATE std::ostream& operator<<(std::ostream& os,
                                             const BbrSender::Mode& mode);
 NET_EXPORT_PRIVATE std::ostream& operator<<(std::ostream& os,
                                             const BbrSender::DebugState& state);
 
 }  // namespace net
 
 #endif  // NET_QUIC_CORE_CONGESTION_CONTROL_BBR_SENDER_H_