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

net/quic/test_tools/simulator/quic_endpoint.h

 // Copyright (c) 2012 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_TEST_TOOLS_SIMULATOR_QUIC_ENDPOINT_H_
 #define NET_QUIC_TEST_TOOLS_SIMULATOR_QUIC_ENDPOINT_H_
 
 #include "net/quic/core/crypto/null_decrypter.h"
 #include "net/quic/core/crypto/null_encrypter.h"
 #include "net/quic/core/quic_connection.h"
-#include "net/quic/core/quic_protocol.h"
+#include "net/quic/core/quic_packets.h"
 #include "net/quic/test_tools/simulator/link.h"
 #include "net/quic/test_tools/simulator/queue.h"
 #include "net/tools/quic/quic_default_packet_writer.h"
 
 namespace net {
 namespace simulator {
 
 // Size of the TX queue used by the kernel/NIC.  1000 is the Linux
 // kernel default.
 const QuicByteCount kTxQueueSize = 1000;
@@ skipping 138 matching lines @@
   void Act() override{};
 
  private:
   std::unordered_map<std::string, QuicEndpoint*> mapping_;
 };
 
 }  // namespace simulator
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_SIMULATOR_QUIC_ENDPOINT_H_