Snapshot of all changes to get jumbo in blink and content.

net/quic/core/crypto/aead_base_encrypter.cc

Index: net/quic/core/crypto/aead_base_encrypter.cc
diff --git a/net/quic/core/crypto/aead_base_encrypter.cc b/net/quic/core/crypto/aead_base_encrypter.cc
index 5620db920a23fac61182f698fb9cac4ff753797d..e87cdf834faff772e66512ae9a05eec63c249bb6 100644
--- a/net/quic/core/crypto/aead_base_encrypter.cc
+++ b/net/quic/core/crypto/aead_base_encrypter.cc
@@ -22,7 +22,7 @@ const size_t kMaxNonceSize = 12;
 
 // In debug builds only, log OpenSSL error stack. Then clear OpenSSL error
 // stack.
-void DLogOpenSslErrors() {
+void DLogOpenSslErrors2() {
 #ifdef NDEBUG
   while (ERR_get_error()) {
   }
@@ -63,7 +63,7 @@ bool AeadBaseEncrypter::SetKey(QuicStringPiece key) {
 
   if (!EVP_AEAD_CTX_init(ctx_.get(), aead_alg_, key_, key_size_, auth_tag_size_,
                          nullptr)) {
-    DLogOpenSslErrors();
+    DLogOpenSslErrors2();
     return false;
   }
 
@@ -93,7 +93,7 @@ bool AeadBaseEncrypter::Encrypt(QuicStringPiece nonce,
           reinterpret_cast<const uint8_t*>(plaintext.data()), plaintext.size(),
           reinterpret_cast<const uint8_t*>(associated_data.data()),
           associated_data.size())) {
-    DLogOpenSslErrors();
+    DLogOpenSslErrors2();
     return false;
   }