Land recent QUIC changes.

net/quic/crypto/null_decrypter.cc

Index: net/quic/crypto/null_decrypter.cc
diff --git a/net/quic/crypto/null_decrypter.cc b/net/quic/crypto/null_decrypter.cc
index 072c684f94c62084f5dd3586475b0679d580905e..92b9204986f70b8f34b57f55f791890675d13cf5 100644
--- a/net/quic/crypto/null_decrypter.cc
+++ b/net/quic/crypto/null_decrypter.cc
@@ -11,7 +11,16 @@ using std::string;
 
 namespace net {
 
-QuicData* NullDecrypter::Decrypt(StringPiece associated_data,
+bool NullDecrypter::SetKey(StringPiece key) {
+  return key.empty();
+}
+
+bool NullDecrypter::SetNoncePrefix(StringPiece nonce_prefix) {
+  return nonce_prefix.empty();
+}
+
+QuicData* NullDecrypter::Decrypt(QuicPacketSequenceNumber /*sequence_number*/,
+                                 StringPiece associated_data,
                                  StringPiece ciphertext) {
   QuicDataReader reader(ciphertext.data(), ciphertext.length());