Land Recent QUIC Changes

net/quic/quic_protocol.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_QUIC_PROTOCOL_H_
 #define NET_QUIC_QUIC_PROTOCOL_H_
 
 #include <stddef.h>
 #include <limits>
 #include <map>
@@ skipping 198 matching lines @@
   QUIC_CRYPTO_MESSAGE_PARAMETER_NOT_FOUND,
   // A crypto message was received with a parameter that has no overlap
   // with the local parameter.
   QUIC_CRYPTO_MESSAGE_PARAMETER_NO_OVERLAP,
   // A crypto message was received that contained a parameter with too few
   // values.
   QUIC_CRYPTO_MESSAGE_INDEX_NOT_FOUND,
   // An internal error occured in crypto processing.
   QUIC_CRYPTO_INTERNAL_ERROR,
   // A crypto handshake message specified an unsupported version.
-  QUIC_VERSION_NOT_SUPPORTED,
+  QUIC_CRYPTO_VERSION_NOT_SUPPORTED,
   // There was no intersection between the crypto primitives supported by the
   // peer and ourselves.
   QUIC_CRYPTO_NO_SUPPORT,
   // The server rejected our client hello messages too many times.
   QUIC_CRYPTO_TOO_MANY_REJECTS,
 
   // No error. Used as bound while iterating.
   QUIC_LAST_ERROR,
 };
 
@@ skipping 428 matching lines @@
   NET_EXPORT_PRIVATE friend std::ostream& operator<<(
       std::ostream& os, const QuicConsumedData& s);
 
   size_t bytes_consumed;
   bool fin_consumed;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_PROTOCOL_H_