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

net/quic/test_tools/simulator/port.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_PORT_H_
 #define NET_QUIC_TEST_TOOLS_SIMULATOR_PORT_H_
 
 #include <string>
 #include <utility>
 
-#include "net/quic/core/quic_protocol.h"
+#include "net/quic/core/quic_packets.h"
 #include "net/quic/test_tools/simulator/actor.h"
 
 namespace net {
 namespace simulator {
 
 struct Packet {
   Packet();
   ~Packet();
   Packet(const Packet& packet);
 
@@ skipping 35 matching lines @@
   virtual void SetTxPort(ConstrainedPortInterface* port) = 0;
 
  protected:
   Endpoint(Simulator* simulator, std::string name);
 };
 
 }  // namespace simulator
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_SIMULATOR_PORT_H_