Update from https://crrev.com/312398

net/quic/crypto/aes_128_gcm_12_encrypter_nss.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/aes_128_gcm_12_encrypter.h"
 
 #include <pk11pub.h>
 #include <secerr.h>
 
 #include "base/lazy_instance.h"
@@ skipping 191 matching lines @@
 
   *out_len = output_len + Aes128Gcm12Encrypter::kAuthTagSize;
   return SECSuccess;
 }
 
 }  // namespace
 
 Aes128Gcm12Encrypter::Aes128Gcm12Encrypter()
     : AeadBaseEncrypter(CKM_AES_GCM, My_Encrypt, kKeySize, kAuthTagSize,
                         kNoncePrefixSize) {
-  COMPILE_ASSERT(kKeySize <= kMaxKeySize, key_size_too_big);
-  COMPILE_ASSERT(kNoncePrefixSize <= kMaxNoncePrefixSize,
-                 nonce_prefix_size_too_big);
+  static_assert(kKeySize <= kMaxKeySize, "key size too big");
+  static_assert(kNoncePrefixSize <= kMaxNoncePrefixSize,
+                "nonce prefix size too big");
   ignore_result(g_gcm_support_checker.Get());
 }
 
 Aes128Gcm12Encrypter::~Aes128Gcm12Encrypter() {}
 
 void Aes128Gcm12Encrypter::FillAeadParams(StringPiece nonce,
                                           StringPiece associated_data,
                                           size_t auth_tag_size,
                                           AeadParams* aead_params) const {
   aead_params->len = sizeof(aead_params->data.gcm_params);
   CK_GCM_PARAMS* gcm_params = &aead_params->data.gcm_params;
   gcm_params->pIv =
       reinterpret_cast<CK_BYTE*>(const_cast<char*>(nonce.data()));
   gcm_params->ulIvLen = nonce.size();
   gcm_params->pAAD =
       reinterpret_cast<CK_BYTE*>(const_cast<char*>(associated_data.data()));
   gcm_params->ulAADLen = associated_data.size();
   gcm_params->ulTagBits = auth_tag_size * 8;
 }
 
 }  // namespace net