Land recent QUIC changes.

net/quic/crypto/null_encrypter.h

Index: net/quic/crypto/null_encrypter.h
diff --git a/net/quic/crypto/null_encrypter.h b/net/quic/crypto/null_encrypter.h
index e73423d640cc34fcfdd4562a3cea502838efd1f2..62f4ef6e1142744a429c96bf133a3dce5260725f 100644
--- a/net/quic/crypto/null_encrypter.h
+++ b/net/quic/crypto/null_encrypter.h
@@ -19,10 +19,15 @@ class NET_EXPORT_PRIVATE NullEncrypter : public QuicEncrypter {
   virtual ~NullEncrypter() {}
 
   // QuicEncrypter implementation
-  virtual QuicData* Encrypt(base::StringPiece associated_data,
+  virtual bool SetKey(base::StringPiece key) OVERRIDE;
+  virtual bool SetNoncePrefix(base::StringPiece nonce_prefix) OVERRIDE;
+  virtual QuicData* Encrypt(QuicPacketSequenceNumber sequence_number,
+                            base::StringPiece associated_data,
                             base::StringPiece plaintext) OVERRIDE;
-  virtual size_t GetMaxPlaintextSize(size_t ciphertext_size) OVERRIDE;
-  virtual size_t GetCiphertextSize(size_t plaintext_size) OVERRIDE;
+  virtual size_t GetKeySize() const OVERRIDE;
+  virtual size_t GetNoncePrefixSize() const OVERRIDE;
+  virtual size_t GetMaxPlaintextSize(size_t ciphertext_size) const OVERRIDE;
+  virtual size_t GetCiphertextSize(size_t plaintext_size) const OVERRIDE;
 };
 
 }  // namespace net