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 49fc927515695b44f852db20a04fb69bcd60b616..b563107cce1aac843398cf246ef52b4a3a82f5e1 100644
--- a/net/quic/crypto/null_encrypter.cc
+++ b/net/quic/crypto/null_encrypter.cc
@@ -51,4 +51,12 @@ size_t NullEncrypter::GetCiphertextSize(size_t plaintext_size) const {
   return plaintext_size + kHashSize;
 }
 
+StringPiece NullEncrypter::GetKey() const {
+  return StringPiece();
+}
+
+StringPiece NullEncrypter::GetNoncePrefix() const {
+  return StringPiece();
+}
+
 }  // namespace net