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

net/quic/chromium/quic_chromium_alarm_factory.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.
 //
 // The Chrome-specific helper for QuicConnection which uses
 // a TaskRunner for alarms, and uses a DatagramClientSocket for writing data.
 
 #ifndef NET_QUIC_QUIC_CHROMIUM_ALARM_FACTORY_H_
 #define NET_QUIC_QUIC_CHROMIUM_ALARM_FACTORY_H_
 
 #include <set>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "net/base/net_export.h"
 #include "net/quic/core/quic_alarm_factory.h"
 #include "net/quic/core/quic_clock.h"
-#include "net/quic/core/quic_protocol.h"
+#include "net/quic/core/quic_packets.h"
 #include "net/quic/core/quic_time.h"
 
 namespace base {
 class TaskRunner;
 }  // namespace base
 
 namespace net {
 
 class NET_EXPORT_PRIVATE QuicChromiumAlarmFactory : public QuicAlarmFactory {
  public:
@@ skipping 11 matching lines @@
   base::TaskRunner* task_runner_;
   const QuicClock* clock_;
   base::WeakPtrFactory<QuicChromiumAlarmFactory> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicChromiumAlarmFactory);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_CHROMIUM_ALARM_FACTORY_H_