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

net/quic/core/crypto/crypto_utils.h

 // 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.
 //
 // Some helpers for quic crypto
 
 #ifndef NET_QUIC_CRYPTO_CRYPTO_UTILS_H_
 #define NET_QUIC_CRYPTO_CRYPTO_UTILS_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <string>
 
 #include "base/macros.h"
 #include "base/strings/string_piece.h"
 #include "net/base/net_export.h"
 #include "net/quic/core/crypto/crypto_handshake.h"
 #include "net/quic/core/crypto/crypto_handshake_message.h"
 #include "net/quic/core/crypto/crypto_protocol.h"
-#include "net/quic/core/quic_protocol.h"
+#include "net/quic/core/quic_packets.h"
 #include "net/quic/core/quic_time.h"
 
 namespace net {
 
 class QuicRandom;
 
 class NET_EXPORT_PRIVATE CryptoUtils {
  public:
   // Diversification is a utility class that's used to act like a union type.
   // Values can be created by calling the functions like |NoDiversification|,
@@ skipping 127 matching lines @@
   static void HashHandshakeMessage(const CryptoHandshakeMessage& message,
                                    std::string* output);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CryptoUtils);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CRYPTO_CRYPTO_UTILS_H_