Land recent QUIC changes.

net/quic/crypto/null_decrypter_test.cc

Index: net/quic/crypto/null_decrypter_test.cc
diff --git a/net/quic/crypto/null_decrypter_test.cc b/net/quic/crypto/null_decrypter_test.cc
index ad73cea3ae478811c73f07079d93253ba7e15125..3d201fe66f993ffba5da94ceb5605babcb7589f8 100644
--- a/net/quic/crypto/null_decrypter_test.cc
+++ b/net/quic/crypto/null_decrypter_test.cc
@@ -23,7 +23,7 @@ TEST(NullDecrypterTest, Decrypt) {
   };
   NullDecrypter decrypter;
   scoped_ptr<QuicData> decrypted(
-      decrypter.Decrypt("hello world!",
+      decrypter.Decrypt(0, "hello world!",
                         StringPiece(reinterpret_cast<const char*>(expected),
                                     arraysize(expected))));
   ASSERT_TRUE(decrypted.get());
@@ -43,7 +43,7 @@ TEST(NullDecrypterTest, BadHash) {
   };
   NullDecrypter decrypter;
   scoped_ptr<QuicData> decrypted(
-      decrypter.Decrypt("hello world!",
+      decrypter.Decrypt(0, "hello world!",
                         StringPiece(reinterpret_cast<const char*>(expected),
                                     arraysize(expected))));
   ASSERT_FALSE(decrypted.get());
@@ -59,7 +59,7 @@ TEST(NullDecrypterTest, ShortInput) {
   };
   NullDecrypter decrypter;
   scoped_ptr<QuicData> decrypted(
-      decrypter.Decrypt("hello world!",
+      decrypter.Decrypt(0, "hello world!",
                         StringPiece(reinterpret_cast<const char*>(expected),
                                     arraysize(expected))));
   ASSERT_FALSE(decrypted.get());