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

net/quic/core/congestion_control/pacing_sender_test.cc

 // Copyright (c) 2013 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.
 
 #include "net/quic/core/congestion_control/pacing_sender.h"
 
 #include <memory>
 
 #include "base/logging.h"
-#include "net/quic/core/quic_protocol.h"
+#include "net/quic/core/quic_packets.h"
 #include "net/quic/test_tools/mock_clock.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::Return;
 using testing::StrictMock;
 using testing::_;
 
 namespace net {
 namespace test {
@@ skipping 322 matching lines @@
   UpdateRtt();
 
   // Ensure only one packet is sent immediately and the rest are paced.
   CheckPacketIsSentImmediately(HAS_RETRANSMITTABLE_DATA, 0, true);
   CheckPacketIsSentImmediately();
   CheckPacketIsDelayed(QuicTime::Delta::FromMilliseconds(2));
 }
 
 }  // namespace test
 }  // namespace net