Update from https://crrev.com/312398

net/quic/crypto/crypto_handshake_message.cc

 // 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.
 
 #include "net/quic/crypto/crypto_handshake_message.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "net/quic/crypto/crypto_framer.h"
 #include "net/quic/crypto/crypto_protocol.h"
@@ skipping 47 matching lines @@
   return *serialized_.get();
 }
 
 void CryptoHandshakeMessage::MarkDirty() {
   serialized_.reset();
 }
 
 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;
 
   va_start(ap, tag);
   for (;;) {
     QuicTag list_item = va_arg(ap, QuicTag);
     if (list_item == 0) {
       break;
     }
@@ skipping 233 matching lines @@
       ret += "0x" + base::HexEncode(it->second.data(), it->second.size());
     }
     ret += "\n";
   }
   --indent;
   ret += string(2 * indent, ' ') + ">";
   return ret;
 }
 
 }  // namespace net