Update from https://crrev.com/312398

net/quic/crypto/crypto_handshake_message.cc

Index: net/quic/crypto/crypto_handshake_message.cc
diff --git a/net/quic/crypto/crypto_handshake_message.cc b/net/quic/crypto/crypto_handshake_message.cc
index cc39286a6cfdc8d5d8916dc13c83541357dc4974..73fc9cf815e6784658a2d3298007835a54b01e4c 100644
--- a/net/quic/crypto/crypto_handshake_message.cc
+++ b/net/quic/crypto/crypto_handshake_message.cc
@@ -65,8 +65,8 @@ void CryptoHandshakeMessage::MarkDirty() {
 void CryptoHandshakeMessage::SetTaglist(QuicTag tag, ...) {
   // Warning, if sizeof(QuicTag) > sizeof(int) then this function will break
   // because the terminating 0 will only be promoted to int.
-  COMPILE_ASSERT(sizeof(QuicTag) <= sizeof(int),
-                 crypto_tag_may_not_be_larger_than_int_or_varargs_will_break);
+  static_assert(sizeof(QuicTag) <= sizeof(int),
+                "crypto tag may not be larger than int or varargs will break");
 
   vector<QuicTag> tags;
   va_list ap;