Land Recent QUIC changes

net/quic/crypto/null_encrypter.cc

Index: net/quic/crypto/null_encrypter.cc
diff --git a/net/quic/crypto/null_encrypter.cc b/net/quic/crypto/null_encrypter.cc
index d8bb6df014b32eff3af9758ee878503095c5292c..a0a680d9c7155cc08018d71d1c7dc0595713a1dc 100644
--- a/net/quic/crypto/null_encrypter.cc
+++ b/net/quic/crypto/null_encrypter.cc
@@ -13,9 +13,7 @@ namespace net {
 
 const size_t kHashSize = 16;  // size of uint128 serialized
 
-bool NullEncrypter::SetKey(StringPiece key) {
-  return key.empty();
-}
+bool NullEncrypter::SetKey(StringPiece key) { return key.empty(); }
 
 bool NullEncrypter::SetNoncePrefix(StringPiece nonce_prefix) {
   return nonce_prefix.empty();
@@ -44,13 +42,9 @@ QuicData* NullEncrypter::EncryptPacket(
   return new QuicData(reinterpret_cast<char*>(buffer), len, true);
 }
 
-size_t NullEncrypter::GetKeySize() const {
-  return 0;
-}
+size_t NullEncrypter::GetKeySize() const { return 0; }
 
-size_t NullEncrypter::GetNoncePrefixSize() const {
-  return 0;
-}
+size_t NullEncrypter::GetNoncePrefixSize() const { return 0; }
 
 size_t NullEncrypter::GetMaxPlaintextSize(size_t ciphertext_size) const {
   return ciphertext_size - kHashSize;
@@ -60,12 +54,8 @@ size_t NullEncrypter::GetCiphertextSize(size_t plaintext_size) const {
   return plaintext_size + kHashSize;
 }
 
-StringPiece NullEncrypter::GetKey() const {
-  return StringPiece();
-}
+StringPiece NullEncrypter::GetKey() const { return StringPiece(); }
 
-StringPiece NullEncrypter::GetNoncePrefix() const {
-  return StringPiece();
-}
+StringPiece NullEncrypter::GetNoncePrefix() const { return StringPiece(); }
 
 }  // namespace net